Merge branch 'work' into tomerge

commands/CmdCD.c

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

database/DBio.c

@@ -2455,10 +2455,12 @@ dbWritePropFunc(key, value, cdata)
     ClientData 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);
     FPRINTR(f, lstring);
+    freeMagic(lstring);
 
     return 0;
 }