github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-15 15:57:13 +00:00
Code Issues Projects Releases Wiki Activity

Correct usage of stat.st_mode result for testing S_IFREG and S_IFDIR (#421)

Browse Source 
stat.st_mode cannot be tested for whether a node is S_IFDIR with
    if (stat.st_mode & S_IFDIR) ...
since S_IFDIR bit (0040000) is a subset of S_IFSOCK (0140000) bits.
A correct check is
    if ((stat.st_mode & S_IFMT) == S_IFDIR) ...
or alternatively, since the convenience macros are defined on all modern systems
    if (S_ISDIR(stat.st_mode)) ...
This commit is contained in:
Nick Briggs 2022-03-29 18:15:21 -07:00 committed by GitHub
parent 90b967c8d3
commit 2bf7047709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dir.c
View File

@ -522,7 +522,7 @@ static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dirp.name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -659,7 +659,7 @@ static int enum_dsk_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dp->d_name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -800,7 +800,7 @@ static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dirp.name); /* moved from below 2/26/93 */
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -922,7 +922,7 @@ static int enum_dsk(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dp->d_name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -1025,7 +1025,7 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dirp.name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -1117,7 +1117,7 @@ static int enum_ufs_prop(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dp->d_name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -1224,7 +1224,7 @@ static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dirp.name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);
@ -1300,7 +1300,7 @@ static int enum_ufs(char *dir, char *name, char *ver, FINFO **finfo_buf)
}
strcpy(namebuf, dp->d_name);
if (sbuf.st_mode & S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
nextp->dirp = 1;
quote_dname(namebuf);
strcpy(nextp->lname, namebuf);

12
src/dsk.c
View File

@ -407,7 +407,7 @@ LispPTR COM_openfile(register LispPTR *args)
if (dskp) {
TIMEOUT(rval = stat(file, &sbuf));
if (rval == 0) {
if ((sbuf.st_mode & S_IFMT) != S_IFREG) {
if (!S_ISREG(sbuf.st_mode)) {
/*
* The Lisp code handles this case as same as "file table
* overflow" error. Final error message is "File won't
@ -513,7 +513,7 @@ LispPTR COM_openfile(register LispPTR *args)
*bufp = ToLispTime(sbuf.st_mtime);
bufp = (int *)(Addr68k_from_LADDR(args[4]));
if (!dskp && ((sbuf.st_mode & S_IFMT) != S_IFREG) && ((sbuf.st_mode & S_IFMT) != S_IFDIR)) {
if (!dskp && (!S_ISREG(sbuf.st_mode)) && (!S_ISDIR(sbuf.st_mode))) {
/*
* Not a regular file or directory file. Put on a marker.
*/
@ -617,7 +617,7 @@ LispPTR COM_closefile(register LispPTR *args)
/* Just close. */
TIMEOUT(rval = close(fd));
if (rval == -1) {
if (!dskp && errno == EPERM && (sbuf.st_mode & S_IFREG) == 0) {
if (!dskp && errno == EPERM && !S_ISREG(sbuf.st_mode)) {
/*
* On {UNIX} device, closing a special file we are not
* the owner of it. Although I don't think close fails
@ -745,7 +745,7 @@ LispPTR COM_closefile(register LispPTR *args)
/* Just close. */
TIMEOUT(rval = close(fd));
if (rval == -1) {
if (!dskp && errno == EPERM && (sbuf.st_mode & S_IFREG) == 0) {
if (!dskp && errno == EPERM && !S_ISREG(sbuf.st_mode)) {
/*
* On {UNIX} device, closing a special file we are not
* the owner of it. Although I don't think close fails
@ -1945,7 +1945,7 @@ LispPTR COM_readpage(register LispPTR *args)
return (NIL);
}
if ((sbuf.st_mode & S_IFREG) != 0) {
if (S_ISREG(sbuf.st_mode)) {
/*
* The request file is a regular file. We have to make sure that
* next byte read is at the beginning of the requested page of the
@ -2096,7 +2096,7 @@ LispPTR COM_truncatefile(register LispPTR *args)
return (NIL);
}
if ((sbuf.st_mode & S_IFREG) == 0) {
if (!S_ISREG(sbuf.st_mode)) {
/*
* The request file is not a regular file. We don't need to
* truncate such file.

4
src/ufs.c
View File

@ -271,7 +271,7 @@ LispPTR UFS_deletefile(LispPTR *args)
* On UNIX device, all we have to do is just to unlink the file
* or directory
*/
if ((sbuf.st_mode & S_IFMT) == S_IFDIR) {
if (S_ISDIR(sbuf.st_mode)) {
TIMEOUT(rval = rmdir(file));
} else {
TIMEOUT(rval = unlink(file));
@ -409,7 +409,7 @@ LispPTR UFS_directorynamep(LispPTR *args)
return (NIL);
}
if ((sbuf.st_mode & S_IFMT) != S_IFDIR) return (NIL);
if (!S_ISDIR(sbuf.st_mode)) return (NIL);
/* Convert Unix file naming convention to Xerox Lisp one. */
if (lisppathname(fullname, dirname, 1, 0) == 0) return (NIL);