Browse Source

Plan 9 from Bell Labs 2003-10-02

David du Colombier 20 years ago
parent
commit
e36f955fb7
3 changed files with 17 additions and 3 deletions
  1. 2 2
      dist/replica/plan9.db
  2. 2 0
      dist/replica/plan9.log
  3. 13 1
      sys/src/cmd/file.c

+ 2 - 2
dist/replica/plan9.db

@@ -224,7 +224,7 @@
 386/bin/ext2srv - 775 sys sys 1064598136 176120
 386/bin/faces - 775 sys sys 1064598137 191011
 386/bin/factor - 775 sys sys 1064598138 59887
-386/bin/file - 775 sys sys 1064598139 117331
+386/bin/file - 775 sys sys 1065017417 118088
 386/bin/fmt - 775 sys sys 1064598139 63563
 386/bin/fortune - 775 sys sys 1064598140 66084
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -7273,7 +7273,7 @@ sys/src/cmd/fax/receive.c - 664 sys sys 944960990 1097
 sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
-sys/src/cmd/file.c - 664 sys sys 1048635557 20358
+sys/src/cmd/file.c - 664 sys sys 1065017417 20590
 sys/src/cmd/fmt.c - 664 sys sys 1025298248 3897
 sys/src/cmd/fortune.c - 664 sys sys 1035832953 1674
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0

+ 2 - 0
dist/replica/plan9.log

@@ -13836,3 +13836,5 @@
 1064889121 2 c sys/src/cmd/ip/httpd/mkfile - 664 sys sys 1064887854 1615
 1064889121 3 a sys/src/cmd/ip/httpd/webls.c - 664 sys sys 1064887840 6940
 1064889121 4 a sys/src/cmd/ip/httpd/webls.denied - 664 sys sys 1064887847 3
+1065018673 0 c 386/bin/file - 775 sys sys 1065017417 118088
+1065018673 1 c sys/src/cmd/file.c - 664 sys sys 1065017417 20590

+ 13 - 1
sys/src/cmd/file.c

@@ -156,6 +156,7 @@ int	ismung(void);
 int	isp9bit(void);
 int	isp9font(void);
 int	isrtf(void);
+int	ismsdos(void);
 int	istring(void);
 int	long0(void);
 int	p9bitnum(uchar*);
@@ -181,6 +182,7 @@ int	(*call[])(void) =
 	isp9bit,	/* plan 9 image (as from /dev/window) */
 	isenglish,	/* char frequency English */
 	isrtf,		/* rich text format */
+	ismsdos,	/* msdos exe (virus file attachement) */
 	0
 };
 
@@ -1115,7 +1117,17 @@ int
 isrtf(void)
 {
 	if(strstr((char *)buf, "\\rtf1")){
-		print(mime ? "application/rtf" : "rich text format");
+		print(mime ? "application/rtf\n" : "rich text format\n");
+		return 1;
+	}
+	return 0;
+}
+
+int
+ismsdos(void)
+{
+	if (buf[0] == 0x4d && buf[1] == 0x5a){
+		print(mime ? "application/x-msdownload\n" : "MSDOS executable\n");
 		return 1;
 	}
 	return 0;