aboutsummaryrefslogtreecommitdiff
path: root/util-linux/mdev.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-13 13:33:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-13 13:33:02 +0000
commitaafbae618126835c006ae0be96959540d5b8f5af (patch)
treed177d967f81eb1631101030d8d6b3edea44b938c /util-linux/mdev.c
parente8a796828eee4b898be2141ecbe34bad594bfbbb (diff)
downloadbusybox-w32-aafbae618126835c006ae0be96959540d5b8f5af.tar.gz
busybox-w32-aafbae618126835c006ae0be96959540d5b8f5af.tar.bz2
busybox-w32-aafbae618126835c006ae0be96959540d5b8f5af.zip
mdev: make usage text more useful
function old new delta packed_usage 26235 26291 +56
Diffstat (limited to 'util-linux/mdev.c')
-rw-r--r--util-linux/mdev.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 6eaa66bf4..584df7df2 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -62,13 +62,13 @@ static void make_device(char *path, int delete)
62 struct bb_uidgid_t ugid = { 0, 0 }; 62 struct bb_uidgid_t ugid = { 0, 0 };
63 parser_t *parser; 63 parser_t *parser;
64 char *tokens[5]; 64 char *tokens[5];
65#endif 65# if ENABLE_FEATURE_MDEV_EXEC
66#if ENABLE_FEATURE_MDEV_EXEC
67 char *command = NULL; 66 char *command = NULL;
68#endif 67# endif
69#if ENABLE_FEATURE_MDEV_RENAME 68# if ENABLE_FEATURE_MDEV_RENAME
70 char *alias = NULL; 69 char *alias = NULL;
71 char aliaslink = aliaslink; /* for compiler */ 70 char aliaslink = aliaslink; /* for compiler */
71# endif
72#endif 72#endif
73 char *dev_maj_min = path + strlen(path); 73 char *dev_maj_min = path + strlen(path);
74 74
@@ -168,21 +168,21 @@ static void make_device(char *path, int delete)
168 168
169 val = tokens[3]; 169 val = tokens[3];
170 /* 4th field (opt): >alias */ 170 /* 4th field (opt): >alias */
171#if ENABLE_FEATURE_MDEV_RENAME 171# if ENABLE_FEATURE_MDEV_RENAME
172 if (!val) 172 if (!val)
173 break; 173 break;
174 aliaslink = *val; 174 aliaslink = *val;
175 if (aliaslink == '>' || aliaslink == '=') { 175 if (aliaslink == '>' || aliaslink == '=') {
176 char *s; 176 char *s;
177#if ENABLE_FEATURE_MDEV_RENAME_REGEXP 177# if ENABLE_FEATURE_MDEV_RENAME_REGEXP
178 char *p; 178 char *p;
179 unsigned i, n; 179 unsigned i, n;
180#endif 180# endif
181 char *a = val; 181 char *a = val;
182 s = strchrnul(val, ' '); 182 s = strchrnul(val, ' ');
183 val = (s[0] && s[1]) ? s+1 : NULL; 183 val = (s[0] && s[1]) ? s+1 : NULL;
184 s[0] = '\0'; 184 s[0] = '\0';
185#if ENABLE_FEATURE_MDEV_RENAME_REGEXP 185# if ENABLE_FEATURE_MDEV_RENAME_REGEXP
186 /* substitute %1..9 with off[1..9], if any */ 186 /* substitute %1..9 with off[1..9], if any */
187 n = 0; 187 n = 0;
188 s = a; 188 s = a;
@@ -206,13 +206,13 @@ static void make_device(char *path, int delete)
206 p++; 206 p++;
207 s++; 207 s++;
208 } 208 }
209#else 209# else
210 alias = xstrdup(a + 1); 210 alias = xstrdup(a + 1);
211#endif 211# endif
212 } 212 }
213#endif /* ENABLE_FEATURE_MDEV_RENAME */ 213# endif /* ENABLE_FEATURE_MDEV_RENAME */
214 214
215#if ENABLE_FEATURE_MDEV_EXEC 215# if ENABLE_FEATURE_MDEV_EXEC
216 /* The rest (opt): command to run */ 216 /* The rest (opt): command to run */
217 if (!val) 217 if (!val)
218 break; 218 break;
@@ -233,7 +233,7 @@ static void make_device(char *path, int delete)
233 command = xstrdup(val + 1); 233 command = xstrdup(val + 1);
234 } 234 }
235 } 235 }
236#endif 236# endif
237 /* end of field parsing */ 237 /* end of field parsing */
238 break; /* we found matching line, stop */ 238 break; /* we found matching line, stop */
239 } /* end of "while line is read from /etc/mdev.conf" */ 239 } /* end of "while line is read from /etc/mdev.conf" */
@@ -255,7 +255,7 @@ static void make_device(char *path, int delete)
255#if ENABLE_FEATURE_MDEV_CONF 255#if ENABLE_FEATURE_MDEV_CONF
256 chown(device_name, ugid.uid, ugid.gid); 256 chown(device_name, ugid.uid, ugid.gid);
257 257
258#if ENABLE_FEATURE_MDEV_RENAME 258# if ENABLE_FEATURE_MDEV_RENAME
259 if (alias) { 259 if (alias) {
260 alias = build_alias(alias, device_name); 260 alias = build_alias(alias, device_name);
261 261
@@ -266,7 +266,7 @@ static void make_device(char *path, int delete)
266 266
267 free(alias); 267 free(alias);
268 } 268 }
269#endif 269# endif
270#endif 270#endif
271 } 271 }
272 272
@@ -406,7 +406,7 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
406 406
407 xchdir("/dev"); 407 xchdir("/dev");
408 408
409 if (argv[1] && !strcmp(argv[1], "-s")) { 409 if (argv[1] && strcmp(argv[1], "-s") == 0) {
410 /* Scan: 410 /* Scan:
411 * mdev -s 411 * mdev -s
412 */ 412 */
@@ -501,5 +501,5 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
501 if (ENABLE_FEATURE_CLEAN_UP) 501 if (ENABLE_FEATURE_CLEAN_UP)
502 RELEASE_CONFIG_BUFFER(temp); 502 RELEASE_CONFIG_BUFFER(temp);
503 503
504 return 0; 504 return EXIT_SUCCESS;
505} 505}