emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a bit more polish

Browse Source
This commit is contained in:
Eric Andersen 2005-07-18 09:45:35 +00:00
parent 54e57da96a
commit 2ada89b60f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/usage.h
View File

@ -1676,7 +1676,6 @@
#define makedevs_full_usage \ #define makedevs_full_usage \
"Creates a range of special files as specified in a device table.\n" \ "Creates a range of special files as specified in a device table.\n" \
"Device table entries take the form of:\n" \ "Device table entries take the form of:\n" \
"type mode user group major minor start increment count\n\n" \
"<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \ "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \
"Where name is the file name, type can be one of:\n" \ "Where name is the file name, type can be one of:\n" \
" f A regular file\n" \ " f A regular file\n" \

10
miscutils/makedevs.c
View File

@ -112,11 +112,11 @@ extern int makedevs_main(int argc, char **argv)
} }
if (optind >= argc || (rootdir=argv[optind])==NULL) { if (optind >= argc || (rootdir=argv[optind])==NULL) {
bb_error_msg_and_die("root directory not speficied"); bb_error_msg_and_die("root directory not specified");
} }
if (chdir(rootdir) != 0) { if (chdir(rootdir) != 0) {
bb_perror_msg_and_die("Couldnt chdir to %s", rootdir); bb_perror_msg_and_die("could not chdir to %s", rootdir);
} }
umask(0); umask(0);
@ -190,7 +190,7 @@ extern int makedevs_main(int argc, char **argv)
else if (type == 'b') { else if (type == 'b') {
mode |= S_IFBLK; mode |= S_IFBLK;
} else { } else {
bb_error_msg("line %d: Unsupported file type %c", linenum, type); bb_error_msg("line %d: unsupported file type %c", linenum, type);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
goto loop; goto loop;
} }
@ -204,7 +204,7 @@ extern int makedevs_main(int argc, char **argv)
sprintf(full_name_inc, "%s%d", full_name, i); sprintf(full_name_inc, "%s%d", full_name, i);
rdev = (major << 8) + minor + (i * increment - start); rdev = (major << 8) + minor + (i * increment - start);
if (mknod(full_name_inc, mode, rdev) == -1) { if (mknod(full_name_inc, mode, rdev) == -1) {
bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc); bb_perror_msg("line %d: could not create node %s", linenum, full_name_inc);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
else if (chown(full_name_inc, uid, gid) == -1) { else if (chown(full_name_inc, uid, gid) == -1) {
@ -216,7 +216,7 @@ extern int makedevs_main(int argc, char **argv)
} else { } else {
rdev = (major << 8) + minor; rdev = (major << 8) + minor;
if (mknod(full_name, mode, rdev) == -1) { if (mknod(full_name, mode, rdev) == -1) {
bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name); bb_perror_msg("line %d: could not create node %s", linenum, full_name);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
else if (chown(full_name, uid, gid) == -1) { else if (chown(full_name, uid, gid) == -1) {