head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.2
	RELEASE_5_2_0:1.2
	RELEASE_4_9_0:1.2
	RELEASE_5_1_0:1.2
	RELEASE_4_8_0:1.2
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.1
	RELEASE_3_5_0:1.1
	RELEASE_4_0_0:1.1
	RELEASE_3_4_0:1.1
	RELEASE_3_3_0:1.1
	RELEASE_3_2_0:1.1
	RELEASE_3_1_0:1.1
	RELEASE_2_2_8:1.1
	RELEASE_3_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2000.08.02.05.34.54;	author kevlo;	state Exp;
branches;
next	1.1;

1.1
date	98.08.10.00.03.14;	author steve;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to version 1.4.2
@
text
@--- src/Fm.h.orig	Tue Aug  1 09:09:35 2000
+++ src/Fm.h	Tue Aug  1 09:16:04 2000
@@@@ -19,10 +19,14 @@@@
 #include <malloc.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#else
 #ifdef _AIX
 #pragma alloca
 #else
 #include <alloca.h>
+#endif
 #endif
 
 #include <stdio.h>
@


1.1
log
@strtol -> strtoul so the 'magic' file is parsed correctly.

PR:		7535
Submitted by:	Sergey Shkonda <serg@@bcs.zp.ua>
@
text
@d1 17
a17 11
--- src/magic.c.orig	Sun Aug  9 13:47:06 1998
+++ src/magic.c	Sun Aug  9 13:47:18 1998
@@@@ -227,7 +227,7 @@@@
 	    default:
 		mtypes[count].flags |= M_EQ;
 	    }
-	    mtypes[count].value.number = strtol(cptr, &cptr, 0);
+	    mtypes[count].value.number = strtoul(cptr, &cptr, 0);
 	}
 	while(isspace(*cptr))
 	    cptr++;
@

