luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed the "-k" option from "gunzip", which is not only redundant 

with "-c" but is unsupported on some OS versions of gunzip.
This commit is contained in:
Tim Edwards 2022-05-09 15:27:51 -04:00
parent da49a50d8e
commit 6e0768ebd4
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.299 8.3.300

2
calma/CalmaWrite.c
View File

@ -965,7 +965,7 @@ calmaProcessDef(def, outf, do_library)
*(modName + strlen(modName) - 3) = '\0'; *(modName + strlen(modName) - 3) = '\0';
sysCmd = mallocMagic(18 + namelen + strlen(modName)); sysCmd = mallocMagic(18 + namelen + strlen(modName));
sprintf(sysCmd, "gunzip -c -k %s > %s", filename, modName); sprintf(sysCmd, "gunzip -c %s > %s", filename, modName);
if (system(sysCmd) != 0) if (system(sysCmd) != 0)
{ {
/* File didn't uncompress. Go back to original name, /* File didn't uncompress. Go back to original name,

2
commands/CmdCD.c
View File

@ -907,7 +907,7 @@ CmdCalma(w, cmd)
sysCmd = mallocMagic(18 + namelen + strlen(modName)); sysCmd = mallocMagic(18 + namelen + strlen(modName));
/* Note: "-k" keeps the original compressed file */ /* Note: "-k" keeps the original compressed file */
TxPrintf("Uncompressing file \"%s\".\n", cmd->tx_argv[2]); TxPrintf("Uncompressing file \"%s\".\n", cmd->tx_argv[2]);
sprintf(sysCmd, "gunzip -c -k %s > %s", cmd->tx_argv[2], modName); sprintf(sysCmd, "gunzip -c %s > %s", cmd->tx_argv[2], modName);
if (system(sysCmd) != 0) if (system(sysCmd) != 0)
{ {
freeMagic(modName); freeMagic(modName);

1
utils/utils.h
View File

@ -44,7 +44,6 @@ extern int LookupStructFull();
extern int PaExpand(char **, char **, int); extern int PaExpand(char **, char **, int);
extern char *nextName(); extern char *nextName();
extern FILE *PaOpen(char *, char *, char *, char *, char *, char **); extern FILE *PaOpen(char *, char *, char *, char *, char *, char **);
extern FILE *PaZOpen(char *, char *, char *, char *, char *, char **, bool *);
extern FILE *PaLockOpen(char *, char *, char *, char *, char *, char **, bool *); extern FILE *PaLockOpen(char *, char *, char *, char *, char *, char **, bool *);
extern char *StrDup(char **, char *); extern char *StrDup(char **, char *);
extern int Match(); extern int Match();