projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed option parsing. Grep would continue grepping, even when given a bad /
[oweals/busybox.git]
/
mknod.c
diff --git
a/mknod.c
b/mknod.c
index 022ab8571421c99ead06d61921d2996ab50825fd..b4d4b82a109cba977bffc206c16da96359f0c8a7 100644
(file)
--- a/
mknod.c
+++ b/
mknod.c
@@
-20,12
+20,14
@@
*
*/
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
#include <errno.h>
-#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include "busybox.h"
int mknod_main(int argc, char **argv)
{
int mknod_main(int argc, char **argv)
{
@@
-51,13
+53,13
@@
int mknod_main(int argc, char **argv)
umask(0);
break;
default:
umask(0);
break;
default:
-
usage(mknod_usage
);
+
show_usage(
);
}
argc--;
argv++;
}
if (argc != 4 && argc != 2) {
}
argc--;
argv++;
}
if (argc != 4 && argc != 2) {
-
usage(mknod_usage
);
+
show_usage(
);
}
switch (argv[1][0]) {
case 'c':
}
switch (argv[1][0]) {
case 'c':
@@
-70,11
+72,11
@@
int mknod_main(int argc, char **argv)
case 'p':
mode = S_IFIFO;
if (argc!=2) {
case 'p':
mode = S_IFIFO;
if (argc!=2) {
-
usage(mknod_usage
);
+
show_usage(
);
}
break;
default:
}
break;
default:
-
usage(mknod_usage
);
+
show_usage(
);
}
if (mode == S_IFCHR || mode == S_IFBLK) {
}
if (mode == S_IFCHR || mode == S_IFBLK) {
@@
-84,7
+86,7
@@
int mknod_main(int argc, char **argv)
mode |= perm;
if (mknod(argv[0], mode, dev) != 0)
mode |= perm;
if (mknod(argv[0], mode, dev) != 0)
-
error_msg_and_die("%s: %s\n", argv[0], strerror(errno)
);
+
perror_msg_and_die("%s", argv[0]
);
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}