Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Insert a missing 'else' which caused mknod(2) to still be called

Browse Source 
even if mkdir(2) failed. At best this caused two (different)
error messages to be printed. At worst, it changed the mode of
an existing file/directory.
This commit is contained in:
scw 1998-10-13 20:11:42 +00:00
parent 65b6624a6d
commit 3c6b31bc90
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/mkdir/mkdir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkdir.c,v 1.20 1998/10/08 02:14:16 wsanchez Exp $ */
/* $NetBSD: mkdir.c,v 1.21 1998/10/13 20:11:42 scw Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1992, 1993\n\
#if 0
static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
#else
__RCSID("$NetBSD: mkdir.c,v 1.20 1998/10/08 02:14:16 wsanchez Exp $");
__RCSID("$NetBSD: mkdir.c,v 1.21 1998/10/13 20:11:42 scw Exp $");
#endif
#endif /* not lint */
@ -118,11 +118,12 @@ main(argc, argv)
if (mkdir(*argv, mode) < 0) {
warn("%s", *argv);
exitval = 1;
}
} else {
/*
* The mkdir() and umask() calls both honor only the low
* nine bits, so if you try to set a mode including the
* sticky, setuid, setgid bits you lose them. So chmod().
* The mkdir() and umask() calls both honor
* only the low nine bits, so if you try to
* set a mode including the sticky, setuid,
* setgid bits you lose them. So chmod().
*/
if (chmod(*argv, mode) == -1) {
warn("%s", *argv);
@ -130,6 +131,7 @@ main(argc, argv)
}
}
}
}
exit(exitval);
/* NOTREACHED */
}