Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9881/ntfsprogs Modified Files: cluster.c mkntfs.c ntfscat.c ntfsclone.c ntfscluster.c ntfscp.c ntfsdecrypt.c ntfsdump_logfile.c ntfsfix.c ntfsinfo.c ntfslabel.c ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c ntfsresize.c ntfsrm.c ntfstruncate.c ntfsundelete.c ntfswipe.c upcase.c utils.c Log Message: Patch from Christophe: A lot of headers are checked by autoconf (AC_CHECK_HEADERS in configure.ac). Please find a patch that add the missing "#ifdef" to the source code. Index: cluster.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/cluster.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- cluster.c 24 Sep 2005 22:54:55 -0000 1.7 +++ cluster.c 28 Sep 2005 13:47:48 -0000 1.8 @@ -23,9 +23,15 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif #include "cluster.h" #include "utils.h" Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -p -r1.67 -r1.68 --- mkntfs.c 27 Sep 2005 15:25:19 -0000 1.67 +++ mkntfs.c 28 Sep 2005 13:47:48 -0000 1.68 @@ -62,16 +62,24 @@ #ifdef HAVE_ERRNO_H # include <errno.h> #endif +#ifdef HAVE_TIME_H #include <time.h> +#endif #ifdef HAVE_GETOPT_H # include <getopt.h> #else extern char *optarg; extern int optind; #endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif #ifdef HAVE_LINUX_MAJOR_H # include <linux/major.h> # ifndef MAJOR @@ -110,7 +118,9 @@ (M) <= SCSI_DISK7_MAJOR)) # endif #endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #if defined(linux) && defined(_IO) && !defined(BLKSSZGET) # define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */ Index: ntfscat.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- ntfscat.c 4 Aug 2005 09:59:44 -0000 1.17 +++ ntfscat.c 28 Sep 2005 13:47:48 -0000 1.18 @@ -24,10 +24,18 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif #include "types.h" #include "attrib.h" Index: ntfsclone.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- ntfsclone.c 25 Sep 2005 21:42:48 -0000 1.50 +++ ntfsclone.c 28 Sep 2005 13:47:48 -0000 1.51 @@ -15,20 +15,42 @@ #include "config.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_VFS_H # include <sys/vfs.h> #endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif #include "debug.h" #include "types.h" Index: ntfscluster.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- ntfscluster.c 21 Aug 2005 00:50:15 -0000 1.26 +++ ntfscluster.c 28 Sep 2005 13:47:48 -0000 1.27 @@ -23,11 +23,21 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #include "ntfscluster.h" #include "types.h" Index: ntfscp.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- ntfscp.c 16 Sep 2005 14:28:18 -0000 1.26 +++ ntfscp.c 28 Sep 2005 13:47:48 -0000 1.27 @@ -24,13 +24,25 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif #include <signal.h> +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include "types.h" #include "attrib.h" Index: ntfsdecrypt.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- ntfsdecrypt.c 26 Aug 2005 12:25:13 -0000 1.18 +++ ntfsdecrypt.c 28 Sep 2005 13:47:48 -0000 1.19 @@ -29,17 +29,39 @@ #error A required header file is missing. Aborting. #endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_GCRYPT_H #include <gcrypt.h> +#endif +#ifdef HAVE_GNUTLS_PKCS12_H #include <gnutls/pkcs12.h> +#endif #include "types.h" #include "attrib.h" Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- ntfsdump_logfile.c 6 Jul 2005 22:47:19 -0000 1.28 +++ ntfsdump_logfile.c 28 Sep 2005 13:47:48 -0000 1.29 @@ -32,15 +32,33 @@ #include "config.h" +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif #include "types.h" #include "endians.h" Index: ntfsfix.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ntfsfix.c 24 Sep 2005 22:54:55 -0000 1.16 +++ ntfsfix.c 28 Sep 2005 13:47:48 -0000 1.17 @@ -45,13 +45,27 @@ #include "config.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif #include "types.h" #include "attrib.h" Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -p -r1.75 -r1.76 --- ntfsinfo.c 24 Sep 2005 22:54:55 -0000 1.75 +++ ntfsinfo.c 28 Sep 2005 13:47:48 -0000 1.76 @@ -46,11 +46,21 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_TIME_H #include <time.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif #ifdef HAVE_ERRNO_H #include <errno.h> Index: ntfslabel.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ntfslabel.c 24 Sep 2005 22:54:55 -0000 1.14 +++ ntfslabel.c 28 Sep 2005 13:47:48 -0000 1.15 @@ -25,12 +25,24 @@ #include "config.h" +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_LOCALE_H #include <locale.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif #include "debug.h" #include "mft.h" Index: ntfsls.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- ntfsls.c 24 Sep 2005 22:54:55 -0000 1.29 +++ ntfsls.c 28 Sep 2005 13:47:48 -0000 1.30 @@ -26,11 +26,21 @@ */ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_TIME_H #include <time.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif #include "types.h" #include "mft.h" Index: ntfsmftalloc.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- ntfsmftalloc.c 6 Jul 2005 22:47:19 -0000 1.5 +++ ntfsmftalloc.c 28 Sep 2005 13:47:48 -0000 1.6 @@ -41,13 +41,17 @@ #ifdef HAVE_ERRNO_H # include <errno.h> #endif +#ifdef HAVE_TIME_H #include <time.h> +#endif #ifdef HAVE_GETOPT_H # include <getopt.h> #else extern int optind; #endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #ifndef LLONG_MAX # define LLONG_MAX 9223372036854775807LL #endif Index: ntfsmount.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- ntfsmount.c 25 Sep 2005 11:42:26 -0000 1.34 +++ ntfsmount.c 28 Sep 2005 13:47:48 -0000 1.35 @@ -24,15 +24,31 @@ #include "config.h" #include <fuse.h> +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_LOCALE_H #include <locale.h> +#endif #include <signal.h> +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #include <getopt.h> #include <time.h> Index: ntfsmove.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ntfsmove.c 24 Sep 2005 23:46:54 -0000 1.15 +++ ntfsmove.c 28 Sep 2005 13:47:48 -0000 1.16 @@ -24,10 +24,18 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif #include "types.h" #include "attrib.h" Index: ntfsresize.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -r1.89 -r1.90 --- ntfsresize.c 24 Sep 2005 22:54:55 -0000 1.89 +++ ntfsresize.c 28 Sep 2005 13:47:48 -0000 1.90 @@ -29,13 +29,27 @@ #include "config.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif #include "debug.h" #include "types.h" Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- ntfsrm.c 24 Sep 2005 22:54:55 -0000 1.61 +++ ntfsrm.c 28 Sep 2005 13:47:48 -0000 1.62 @@ -21,11 +21,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_TIME_H #include <time.h> +#endif #include "utils.h" #include "ntfsrm.h" Index: ntfstruncate.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- ntfstruncate.c 6 Jul 2005 22:47:19 -0000 1.26 +++ ntfstruncate.c 28 Sep 2005 13:47:48 -0000 1.27 @@ -42,14 +42,18 @@ #ifdef HAVE_ERRNO_H # include <errno.h> #endif +#ifdef HAVE_TIME_H #include <time.h> +#endif #ifdef HAVE_GETOPT_H # include <getopt.h> #else extern char *optarg; extern int optind; #endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #ifndef LLONG_MAX # define LLONG_MAX 9223372036854775807LL #endif Index: ntfsundelete.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -r1.45 -r1.46 --- ntfsundelete.c 14 Aug 2005 15:44:48 -0000 1.45 +++ ntfsundelete.c 28 Sep 2005 13:47:48 -0000 1.46 @@ -28,20 +28,46 @@ #ifdef HAVE_FEATURES_H # include <features.h> #endif +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_TIME_H #include <time.h> +#endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif #include <regex.h> +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_UTIME_H #include <utime.h> +#endif #include "ntfsundelete.h" #include "bootsect.h" Index: ntfswipe.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -p -r1.37 -r1.38 --- ntfswipe.c 24 Sep 2005 22:54:55 -0000 1.37 +++ ntfswipe.c 28 Sep 2005 13:47:48 -0000 1.38 @@ -24,13 +24,27 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include "ntfswipe.h" #include "types.h" Index: upcase.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/upcase.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- upcase.c 14 May 2004 13:02:33 -0000 1.8 +++ upcase.c 28 Sep 2005 13:47:48 -0000 1.9 @@ -24,7 +24,9 @@ #include "config.h" +#ifdef HAVE_STRING_H #include <string.h> +#endif #include "types.h" Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- utils.c 24 Sep 2005 22:54:55 -0000 1.44 +++ utils.c 28 Sep 2005 13:47:48 -0000 1.45 @@ -25,20 +25,42 @@ #include "config.h" +#ifdef HAVE_STDIO_H #include <stdio.h> +#endif +#ifdef HAVE_STDARG_H #include <stdarg.h> +#endif +#ifdef HAVE_ERRNO_H #include <errno.h> +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_STRING_H #include <string.h> +#endif +#ifdef HAVE_LOCALE_H #include <locale.h> +#endif #ifdef HAVE_LIBINTL_H # include <libintl.h> #endif +#ifdef HAVE_STDLIB_H #include <stdlib.h> +#endif +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif +#ifdef HAVE_CTYPE_H #include <ctype.h> +#endif #include "config.h" #include "utils.h" |
