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

losetup: getopt_ulflags'ification + small fix for perror_nomsg

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-22 14:53:41 +00:00
parent 099efbf99e
commit 27ee7ba95e
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/verror_msg.c
View File

@ -27,7 +27,9 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr)
if (!strerr) if (!strerr)
fputs(msg_eol, stderr); fputs(msg_eol, stderr);
else else
fprintf(stderr, ": %s%s", strerr, msg_eol); fprintf(stderr, "%s%s%s",
s ? ": " : "",
strerr, msg_eol);
} }
if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG)) { if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG)) {
if (!strerr) if (!strerr)

64
util-linux/losetup.c
View File

@ -12,39 +12,41 @@
#include "busybox.h" #include "busybox.h"
int losetup_main (int argc, char **argv) int losetup_main(int argc, char **argv)
{ {
int offset = 0; unsigned long opt;
char *opt_o;
int offset = 0;
/* This will need a "while(getopt()!=-1)" loop when we can have more than opt = bb_getopt_ulflags(argc, argv, "do:", &opt_o);
one option, but for now we can't. */ argc -= optind;
switch(getopt(argc,argv, "do:")) { argv += optind;
case 'd':
/* detach takes exactly one argument */
if(optind+1!=argc) bb_show_usage();
if(!del_loop(argv[optind])) return EXIT_SUCCESS;
die_failed:
bb_perror_msg_and_die("%s",argv[optind]);
case 'o': if (opt == 0x3) bb_show_usage(); // -d and -o (illegal)
offset = bb_xparse_number (optarg, NULL);
/* Fall through to do the losetup */ if (opt == 0x1) { // -d
case -1: /* detach takes exactly one argument */
/* losetup takes two argument:, loop_device and file */ if (argc != 1)
if(optind+2==argc) { bb_show_usage();
if(set_loop(&argv[optind], argv[optind + 1], offset)>=0) if (!del_loop(argv[0]))
return EXIT_SUCCESS; return EXIT_SUCCESS;
else goto die_failed; bb_perror_nomsg_and_die();
} }
if(optind+1==argc) {
char *s=query_loop(argv[optind]); if (opt == 0x2) // -o
if (!s) goto die_failed; offset = bb_xparse_number(opt_o, NULL);
printf("%s: %s\n",argv[optind],s);
if(ENABLE_FEATURE_CLEAN_UP) free(s); /* -o or no option */
if (argc == 2) {
if (set_loop(&argv[0], argv[1], offset) < 0)
bb_perror_nomsg_and_die();
} else if (argc == 1) {
char *s = query_loop(argv[0]);
if (!s) bb_perror_nomsg_and_die();
printf("%s: %s\n", argv[0], s);
if (ENABLE_FEATURE_CLEAN_UP) free(s);
} else
bb_show_usage();
return EXIT_SUCCESS; return EXIT_SUCCESS;
}
break;
}
bb_show_usage();
return EXIT_FAILURE;
} }