aboutsummaryrefslogtreecommitdiff
path: root/getopt.c
diff options
context:
space:
mode:
authormarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-12-07 19:56:48 +0000
committermarkw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-12-07 19:56:48 +0000
commitb529ac16d7308cb6e852b286b42ebe971a32cd3f (patch)
treea55822621d54bd82c54e272fa986e45698fea0f1 /getopt.c
parentad3527fc1543422f053975ac4f37365a8585d7c5 (diff)
downloadbusybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.tar.gz
busybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.tar.bz2
busybox-w32-b529ac16d7308cb6e852b286b42ebe971a32cd3f.zip
Changed names of functions in utility.c and all affected files, to make
compliant with the style guide. Everybody rebuild your tags file! git-svn-id: svn://busybox.net/trunk/busybox@1398 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'getopt.c')
-rw-r--r--getopt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/getopt.c b/getopt.c
index 8c94bb4c1..0ebf9df08 100644
--- a/getopt.c
+++ b/getopt.c
@@ -37,7 +37,7 @@
37 * <misiek@misiek.eu.org>) 37 * <misiek@misiek.eu.org>)
38 * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org> 38 * Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org>
39 * Removed --version/-V and --help/-h in 39 * Removed --version/-V and --help/-h in
40 * Removed prase_error(), using errorMsg() from Busybox instead 40 * Removed prase_error(), using error_msg() from Busybox instead
41 * Replaced our_malloc with xmalloc and our_realloc with xrealloc 41 * Replaced our_malloc with xmalloc and our_realloc with xrealloc
42 * 42 *
43 */ 43 */
@@ -258,7 +258,7 @@ void add_long_options(char *options)
258 arg_opt=required_argument; 258 arg_opt=required_argument;
259 } 259 }
260 if (strlen(tokptr) == 0) 260 if (strlen(tokptr) == 0)
261 errorMsg("empty long option after -l or --long argument\n"); 261 error_msg("empty long option after -l or --long argument\n");
262 } 262 }
263 add_longopt(tokptr,arg_opt); 263 add_longopt(tokptr,arg_opt);
264 } 264 }
@@ -277,7 +277,7 @@ void set_shell(const char *new_shell)
277 else if (!strcmp(new_shell,"csh")) 277 else if (!strcmp(new_shell,"csh"))
278 shell=TCSH; 278 shell=TCSH;
279 else 279 else
280 errorMsg("unknown shell after -s or --shell argument\n"); 280 error_msg("unknown shell after -s or --shell argument\n");
281} 281}
282 282
283 283
@@ -326,7 +326,7 @@ int getopt_main(int argc, char *argv[])
326 printf(" --\n"); 326 printf(" --\n");
327 exit(0); 327 exit(0);
328 } else 328 } else
329 fatalError("missing optstring argument\n"); 329 error_msg_and_die("missing optstring argument\n");
330 } 330 }
331 331
332 if (argv[1][0] != '-' || compatible) { 332 if (argv[1][0] != '-' || compatible) {
@@ -377,7 +377,7 @@ int getopt_main(int argc, char *argv[])
377 377
378 if (!optstr) { 378 if (!optstr) {
379 if (optind >= argc) 379 if (optind >= argc)
380 fatalError("missing optstring argument\n"); 380 error_msg_and_die("missing optstring argument\n");
381 else { 381 else {
382 optstr=xmalloc(strlen(argv[optind])+1); 382 optstr=xmalloc(strlen(argv[optind])+1);
383 strcpy(optstr,argv[optind]); 383 strcpy(optstr,argv[optind]);