svn commit: r264067 - head/bin/dd

[Xin LI]

Author: delphij
Date: Thu Apr  3 06:32:02 2014
New Revision: 264067
URL: http://svnweb.freebsd.org/changeset/base/264067

Log:
  Make C_* contants fit in 32 bits again by using 4 unused bits.
  
  Noticed by:	bde

Modified:
  head/bin/dd/dd.c
  head/bin/dd/dd.h
  head/bin/dd/extern.h

Modified: head/bin/dd/dd.c
==============================================================================
--- head/bin/dd/dd.c	Thu Apr  3 05:49:28 2014	(r264066)
+++ head/bin/dd/dd.c	Thu Apr  3 06:32:02 2014	(r264067)
@@ -76,7 +76,7 @@ STAT	st;			/* statistics */
 void	(*cfunc)(void);		/* conversion function */
 uintmax_t cpy_cnt;		/* # of blocks to copy */
 static off_t	pending = 0;	/* pending seek if sparse */
-u_int64_t	ddflags = 0;	/* conversion options */
+u_int	ddflags = 0;		/* conversion options */
 size_t	cbsz;			/* conversion block size */
 uintmax_t files_cnt = 1;	/* # of files to copy */
 const	u_char *ctab;		/* conversion table */

Modified: head/bin/dd/dd.h
==============================================================================
--- head/bin/dd/dd.h	Thu Apr  3 05:49:28 2014	(r264066)
+++ head/bin/dd/dd.h	Thu Apr  3 06:32:02 2014	(r264067)
@@ -68,35 +68,35 @@ typedef struct {
 } STAT;
 
 /* Flags (in ddflags). */
-#define	C_ASCII		0x000000001
-#define	C_BLOCK		0x000000002
-#define	C_BS		0x000000004
-#define	C_CBS		0x000000008
-#define	C_COUNT		0x000000010
-#define	C_EBCDIC	0x000000020
-#define	C_FILES		0x000000040
-#define	C_IBS		0x000000080
-#define	C_IF		0x000000100
-#define	C_LCASE		0x000000200
-#define	C_NOERROR	0x000000400
-#define	C_NOTRUNC	0x000000800
-#define	C_OBS		0x000001000
-#define	C_OF		0x000002000
-#define	C_OSYNC		0x000004000
-#define	C_PAREVEN	0x000008000
-#define	C_PARNONE	0x000100000
-#define	C_PARODD	0x000200000
-#define	C_PARSET	0x000400000
-#define	C_SEEK		0x000800000
-#define	C_SKIP		0x001000000
-#define	C_SPARSE	0x002000000
-#define	C_SWAB		0x004000000
-#define	C_SYNC		0x008000000
-#define	C_UCASE		0x010000000
-#define	C_UNBLOCK	0x020000000
-#define	C_FILL		0x040000000
-#define	C_STATUS	0x080000000
-#define	C_NOXFER	0x100000000
-#define	C_NOINFO	0x200000000
+#define	C_ASCII		0x00000001
+#define	C_BLOCK		0x00000002
+#define	C_BS		0x00000004
+#define	C_CBS		0x00000008
+#define	C_COUNT		0x00000010
+#define	C_EBCDIC	0x00000020
+#define	C_FILES		0x00000040
+#define	C_IBS		0x00000080
+#define	C_IF		0x00000100
+#define	C_LCASE		0x00000200
+#define	C_NOERROR	0x00000400
+#define	C_NOTRUNC	0x00000800
+#define	C_OBS		0x00001000
+#define	C_OF		0x00002000
+#define	C_OSYNC		0x00004000
+#define	C_PAREVEN	0x00008000
+#define	C_PARNONE	0x00010000
+#define	C_PARODD	0x00020000
+#define	C_PARSET	0x00040000
+#define	C_SEEK		0x00080000
+#define	C_SKIP		0x00100000
+#define	C_SPARSE	0x00200000
+#define	C_SWAB		0x00400000
+#define	C_SYNC		0x00800000
+#define	C_UCASE		0x01000000
+#define	C_UNBLOCK	0x02000000
+#define	C_FILL		0x04000000
+#define	C_STATUS	0x08000000
+#define	C_NOXFER	0x10000000
+#define	C_NOINFO	0x20000000
 
 #define	C_PARITY	(C_PAREVEN | C_PARODD | C_PARNONE | C_PARSET)

Modified: head/bin/dd/extern.h
==============================================================================
--- head/bin/dd/extern.h	Thu Apr  3 05:49:28 2014	(r264066)
+++ head/bin/dd/extern.h	Thu Apr  3 06:32:02 2014	(r264067)
@@ -53,7 +53,7 @@ extern STAT st;
 extern void (*cfunc)(void);
 extern uintmax_t cpy_cnt;
 extern size_t cbsz;
-extern u_int64_t ddflags;
+extern u_int ddflags;
 extern uintmax_t files_cnt;
 extern const u_char *ctab;
 extern const u_char a2e_32V[], a2e_POSIX[];