sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RetroBSD/retrobsd.

Browse Source
This commit is contained in:
Serge Vakulenko
2015-09-07 21:32:55 -07:00
parent 2c41b4d9e1 49de16b343
commit 9c8ee0a1a4
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/smlrc/cgmips.c
View File

@@ -541,7 +541,7 @@ void GenUpdateFrameSize(void)
STATIC
void GenFxnProlog(void)
{
if (CurFxnParamCntMax)
if (CurFxnParamCntMin && CurFxnParamCntMax)
{
int i, cnt = CurFxnParamCntMax;
if (cnt > 4)

32
tools/fsutil/fsutil.c
View File

@@ -247,6 +247,25 @@ void extract_inode (fs_inode_t *inode, char *path)
close (fd);
}
void extract_symlink (fs_inode_t *inode, char *path)
{
char data [BSDFS_BSIZE];
if (inode->size >= BSDFS_BSIZE) {
fprintf (stderr, "%s: too long symlink\n", path);
return;
}
if (! fs_inode_read (inode, 0, (unsigned char*)data, inode->size)) {
fprintf (stderr, "%s: error reading symlink\n", path);
return;
}
data[inode->size] = 0;
if (symlink(data, path) < 0) {
perror (path);
return;
}
}
void extractor (fs_inode_t *dir, fs_inode_t *inode,
char *dirname, char *filename, void *arg)
{
@@ -257,7 +276,8 @@ void extractor (fs_inode_t *dir, fs_inode_t *inode,
print_inode (inode, dirname, filename, out);
if ((inode->mode & INODE_MODE_FMT) != INODE_MODE_FDIR &&
(inode->mode & INODE_MODE_FMT) != INODE_MODE_FREG)
(inode->mode & INODE_MODE_FMT) != INODE_MODE_FREG &&
(inode->mode & INODE_MODE_FMT) != INODE_MODE_FLNK)
return;
path = alloca (strlen (dirname) + strlen (filename) + 2);
@@ -267,13 +287,19 @@ void extractor (fs_inode_t *dir, fs_inode_t *inode,
for (relpath=path; *relpath == '/'; relpath++)
continue;
if ((inode->mode & INODE_MODE_FMT) == INODE_MODE_FDIR) {
switch (inode->mode & INODE_MODE_FMT) {
case INODE_MODE_FDIR:
if (mkdir (relpath, 0775) < 0 && errno != EEXIST)
perror (relpath);
/* Scan subdirectory. */
fs_directory_scan (inode, path, extractor, arg);
} else {
break;
case INODE_MODE_FREG:
extract_inode (inode, relpath);
break;
case INODE_MODE_FLNK:
extract_symlink (inode, relpath);
break;
}
}