aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-07-18 09:45:35 +0000
committerEric Andersen <andersen@codepoet.org>2005-07-18 09:45:35 +0000
commit2ada89b60f61019b3e1b80819257cc8af486e10c (patch)
tree9171f10eefff37761025af06b5f3688af9adf3bb
parent54e57da96a073330463dde1f62fda85b7290ed4c (diff)
downloadbusybox-w32-2ada89b60f61019b3e1b80819257cc8af486e10c.tar.gz
busybox-w32-2ada89b60f61019b3e1b80819257cc8af486e10c.tar.bz2
busybox-w32-2ada89b60f61019b3e1b80819257cc8af486e10c.zip
a bit more polish
-rw-r--r--include/usage.h1
-rw-r--r--miscutils/makedevs.c10
2 files changed, 5 insertions, 6 deletions
diff --git a/include/usage.h b/include/usage.h
index ff99c4041..363b01cdd 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1676,7 +1676,6 @@
1676#define makedevs_full_usage \ 1676#define makedevs_full_usage \
1677 "Creates a range of special files as specified in a device table.\n" \ 1677 "Creates a range of special files as specified in a device table.\n" \
1678 "Device table entries take the form of:\n" \ 1678 "Device table entries take the form of:\n" \
1679 "type mode user group major minor start increment count\n\n" \
1680 "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \ 1679 "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \
1681 "Where name is the file name, type can be one of:\n" \ 1680 "Where name is the file name, type can be one of:\n" \
1682 " f A regular file\n" \ 1681 " f A regular file\n" \
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index ffcbe7ac3..b6473e7e5 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -112,11 +112,11 @@ extern int makedevs_main(int argc, char **argv)
112 } 112 }
113 113
114 if (optind >= argc || (rootdir=argv[optind])==NULL) { 114 if (optind >= argc || (rootdir=argv[optind])==NULL) {
115 bb_error_msg_and_die("root directory not speficied"); 115 bb_error_msg_and_die("root directory not specified");
116 } 116 }
117 117
118 if (chdir(rootdir) != 0) { 118 if (chdir(rootdir) != 0) {
119 bb_perror_msg_and_die("Couldnt chdir to %s", rootdir); 119 bb_perror_msg_and_die("could not chdir to %s", rootdir);
120 } 120 }
121 121
122 umask(0); 122 umask(0);
@@ -190,7 +190,7 @@ extern int makedevs_main(int argc, char **argv)
190 else if (type == 'b') { 190 else if (type == 'b') {
191 mode |= S_IFBLK; 191 mode |= S_IFBLK;
192 } else { 192 } else {
193 bb_error_msg("line %d: Unsupported file type %c", linenum, type); 193 bb_error_msg("line %d: unsupported file type %c", linenum, type);
194 ret = EXIT_FAILURE; 194 ret = EXIT_FAILURE;
195 goto loop; 195 goto loop;
196 } 196 }
@@ -204,7 +204,7 @@ extern int makedevs_main(int argc, char **argv)
204 sprintf(full_name_inc, "%s%d", full_name, i); 204 sprintf(full_name_inc, "%s%d", full_name, i);
205 rdev = (major << 8) + minor + (i * increment - start); 205 rdev = (major << 8) + minor + (i * increment - start);
206 if (mknod(full_name_inc, mode, rdev) == -1) { 206 if (mknod(full_name_inc, mode, rdev) == -1) {
207 bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc); 207 bb_perror_msg("line %d: could not create node %s", linenum, full_name_inc);
208 ret = EXIT_FAILURE; 208 ret = EXIT_FAILURE;
209 } 209 }
210 else if (chown(full_name_inc, uid, gid) == -1) { 210 else if (chown(full_name_inc, uid, gid) == -1) {
@@ -216,7 +216,7 @@ extern int makedevs_main(int argc, char **argv)
216 } else { 216 } else {
217 rdev = (major << 8) + minor; 217 rdev = (major << 8) + minor;
218 if (mknod(full_name, mode, rdev) == -1) { 218 if (mknod(full_name, mode, rdev) == -1) {
219 bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name); 219 bb_perror_msg("line %d: could not create node %s", linenum, full_name);
220 ret = EXIT_FAILURE; 220 ret = EXIT_FAILURE;
221 } 221 }
222 else if (chown(full_name, uid, gid) == -1) { 222 else if (chown(full_name, uid, gid) == -1) {