luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-29 01:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrected EFArgs() so that "ext2spice run -help" works as advertised;

Browse Source 
e.g., "-h" or "-help" is now recognized as a valid option instead of
printing a usage message by way of throwing an error.
This commit is contained in:
Tim Edwards
2019-10-16 09:17:58 -04:00
parent 8b0a9275a8
commit 46f3f44849
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext2spice/ext2spice.c
+15 -10
View File
@@ -1147,6 +1147,17 @@ spcmainArgs(pargc, pargv)
char **argv = *pargv, *cp;
int argc = *pargc;
char usage_text[] = "Usage: ext2spice "
"[-B] [-o spicefile] [-M|-m] [-y cap_digits] "
"[-J flat|hier]\n"
"[-f spice2|spice3|hspice|ngspice] [-M] [-m] "
#ifdef MAGIC_WRAPPER
"[file]\n";
#else
"[-j device:sdRclass[/subRclass]/defaultSubstrate]\n"
"file\n\n or else see options to extcheck(1)\n";
#endif
switch (argv[0][1])
{
case 'd':
@@ -1243,6 +1254,9 @@ spcmainArgs(pargc, pargv)
break;
}
#endif /* MAGIC_WRAPPER */
case 'h': /* -h or -help, as suggested by "ext2spice help" */
TxPrintf(usage_text);
break;
default:
TxError("Unrecognized flag: %s\n", argv[0]);
goto usage;
@@ -1253,16 +1267,7 @@ spcmainArgs(pargc, pargv)
return 0;
usage:
TxError("Usage: ext2spice [-B] [-o spicefile] [-M|-m] [-y cap_digits] "
"[-J flat|hier]\n"
"[-f spice2|spice3|hspice|ngspice] [-M] [-m] "
#ifdef MAGIC_WRAPPER
"[file]\n"
#else
"[-j device:sdRclass[/subRclass]/defaultSubstrate]\n"
"file\n\n or else see options to extcheck(1)\n"
#endif
);
TxError(usage_text);
#ifdef MAGIC_WRAPPER
return 1;