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

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-01-08 21:45:36 -05:00
parent 0e67aabc36 aebabc0447
commit 944c6a5373
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
commands/CmdCD.c
View File

@ -3497,6 +3497,7 @@ CmdDrc(w, cmd)
case DRC_OFF: case DRC_OFF:
DRCBackGround = DRC_SET_OFF; DRCBackGround = DRC_SET_OFF;
DRCBreak();
#ifdef MAGIC_WRAPPER #ifdef MAGIC_WRAPPER
if (TxInputRedirect != TX_INPUT_REDIRECTED) if (TxInputRedirect != TX_INPUT_REDIRECTED)
#endif #endif

4
database/DBio.c
View File

@ -2455,10 +2455,12 @@ dbWritePropFunc(key, value, cdata)
ClientData cdata; ClientData cdata;
{ {
FILE *f = (FILE *)cdata; FILE *f = (FILE *)cdata;
char lstring[256]; char *lstring;
lstring = (char *)mallocMagic(10 + strlen((char *)value) + strlen(key));
sprintf(lstring, "string %s %s\n", key, (char *)value); sprintf(lstring, "string %s %s\n", key, (char *)value);
FPRINTR(f, lstring); FPRINTR(f, lstring);
freeMagic(lstring);
return 0; return 0;
} }