source: patches/file-5.00-fixes-1.patch@ 4a0ccf9

magic/Magdir/msdos

@@ -294 +294 @@
 >10     string  >\x23                   
 >>10    string  !\x2e                   
 >>>17   string  <\x5B                   
->>>>10  string  x                       \b, name: %.8s
-#UDMA.SYS KEYB.SYS CMD640X2.SYS
+>>>>10  string  CMD640X2.SYS                    \b, name: %.8s
+#UDMA.SYS
 >10     string  <\x41                   
 >>12    string  >\x40                   
 >>>10   string  !$                      
->>>>12  string  x                       \b, name: %.8s
-#BTCDROM.SYS ASPICD.SYS
+>>>>12  string  UDMA.SYS                        \b, name: %.8s
+#CMD640X2.SYS
+>10     string  <\x41                   
+>>12    string  >\x40                   
+>>>10   string  !$                      
+>>>>12  string  CMD640X2.SYS                    \b, name: %.8s
+#KEYB.SYS
+>10     string  <\x41                   
+>>12    string  >\x40                   
+>>>10   string  !$                      
+>>>>12  string  KEYB.SYS                        \b, name: %.8s
+#BTCDROM.SYS
+>22     string  >\x40                   
+>>22    string  <\x5B                   
+>>>23   string  <\x5B                   
+>>>>22  string  BTCDROM.SYS                     \b, name: %.8s
+#ASPICD.SYS
 >22     string  >\x40                   
 >>22    string  <\x5B                   
 >>>23   string  <\x5B                   
->>>>22  string  x                       \b, name: %.8s
+>>>>22  string  ASPICD.SYS                      \b, name: %.8s
 #ATAPICD.SYS
 >76     string  \0                      
 >>77    string  >\x40                   
 >>>77   string  <\x5B                   
->>>>77  string  x                       \b, name: %.8s
+>>>>77  string  ATAPICD.SYS                     \b, name: %.8s
 # test too generic ?
 0       byte            0x8c            DOS executable (COM)
 # updated by Joerg Jenderek at Oct 2008

src/readcdf.c

@@ -75 +75 @@
                         if (len > 1) {
                                 s = info[i].pi_str.s_buf;
                                 if (NOTMIME(ms)) {
-                                        if (file_printf(ms, ", %s: %.*s", buf,
-                                            len, s) == -1)
-                                                return -1;
+                                        char vbuf[1024];
+                                        size_t j;
+                                        for (j = 0; j < sizeof(vbuf) && len--;
+                                            j++, s++) {
+                                                if (*s == '\0')
+                                                        break;
+                                                if (isprint((unsigned char)*s))
+                                                        vbuf[j] = *s;
+                                        }
+                                        if (j == sizeof(vbuf))
+                                                --j;
+                                        vbuf[j] = '\0';
+                                        if (vbuf[0]) {
+                                                if (file_printf(ms, ", %s: %s",
+                                                    buf, vbuf) == -1)
+                                                        return -1;
+                                        }
                                 } else if (info[i].pi_id == 
                                         CDF_PROPERTY_NAME_OF_APPLICATION) {
                                         if (strstr(s, "Word"))