emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #219 from infinnovation-dev/master

Browse Source 
libmisc: Accept --root=path and --prefix=path option syntax
This commit is contained in:
Serge Hallyn 2020-02-26 19:34:13 -06:00 committed by GitHub
commit 724442c3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmisc/prefix_flag.c
View File

@ -74,10 +74,13 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
* Parse the command line options. * Parse the command line options.
*/ */
int i; int i;
const char *prefix = NULL; const char *prefix = NULL, *val;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
val = NULL;
if ( (strcmp (argv[i], "--prefix") == 0) if ( (strcmp (argv[i], "--prefix") == 0)
|| ((strncmp (argv[i], "--prefix=", 9) == 0)
&& (val = argv[i] + 9))
|| (strcmp (argv[i], short_opt) == 0)) { || (strcmp (argv[i], short_opt) == 0)) {
if (NULL != prefix) { if (NULL != prefix) {
fprintf (stderr, fprintf (stderr,
@ -86,13 +89,16 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
exit (E_BAD_ARG); exit (E_BAD_ARG);
} }
if (i + 1 == argc) { if (val) {
prefix = val;
} else if (i + 1 == argc) {
fprintf (stderr, fprintf (stderr,
_("%s: option '%s' requires an argument\n"), _("%s: option '%s' requires an argument\n"),
Prog, argv[i]); Prog, argv[i]);
exit (E_BAD_ARG); exit (E_BAD_ARG);
} else {
prefix = argv[++ i];
} }
prefix = argv[i + 1];
} }
} }

12
libmisc/root_flag.c
View File

@ -56,10 +56,13 @@ extern void process_root_flag (const char* short_opt, int argc, char **argv)
* Parse the command line options. * Parse the command line options.
*/ */
int i; int i;
const char *newroot = NULL; const char *newroot = NULL, *val;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
val = NULL;
if ( (strcmp (argv[i], "--root") == 0) if ( (strcmp (argv[i], "--root") == 0)
|| ((strncmp (argv[i], "--root=", 7) == 0)
&& (val = argv[i] + 7))
|| (strcmp (argv[i], short_opt) == 0)) { || (strcmp (argv[i], short_opt) == 0)) {
if (NULL != newroot) { if (NULL != newroot) {
fprintf (stderr, fprintf (stderr,
@ -68,13 +71,16 @@ extern void process_root_flag (const char* short_opt, int argc, char **argv)
exit (E_BAD_ARG); exit (E_BAD_ARG);
} }
if (i + 1 == argc) { if (val) {
newroot = val;
} else if (i + 1 == argc) {
fprintf (stderr, fprintf (stderr,
_("%s: option '%s' requires an argument\n"), _("%s: option '%s' requires an argument\n"),
Prog, argv[i]); Prog, argv[i]);
exit (E_BAD_ARG); exit (E_BAD_ARG);
} else {
newroot = argv[++ i];
} }
newroot = argv[i + 1];
} }
} }