[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.68,1.69 ntfscmp.c,1.3,1.4

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12440

Modified Files:
	mkntfs.c ntfscmp.c 
Log Message:
Add missing options to mkntfs' getopt() parsing string.  (What a silly bug!)
Fix a compile warning in ntfscmp.


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- mkntfs.c	28 Sep 2005 13:47:48 -0000	1.68
+++ mkntfs.c	30 Sep 2005 19:24:13 -0000	1.69
@@ -169,8 +169,8 @@ ntfs_volume *vol;
 char *dev_name;
 
 struct {
-	long long part_start_sect;	/* start sector of partition on parent
-					   device */
+	long long part_start_sect;	/* -p, start sector of partition on
+					   parent device */
 	long long nr_sectors;		/* size of device in sectors */
 	long long nr_clusters;		/* Note: Win2k treats clusters as
 					   32-bit entities! */
@@ -198,9 +198,9 @@ struct {
 	u32 upcase_len;			/* Determined automatically. */
 	int sector_size;		/* -s, in bytes, power of 2, default is
 					   512 bytes. */
-	int sectors_per_track;		/* number of sectors per track on
+	int sectors_per_track;		/* -S, number of sectors per track on
 					   device */
-	int heads;			/* number of heads on device */
+	int heads;			/* -H, number of heads on device */
 	int quiet;			/* -q, quiet execution. */
 	int verbose;			/* -v, verbose execution, given twice,
 					 * really verbose execution (debug
@@ -357,7 +357,7 @@ static void parse_options(int argc, char
 	if (argc && *argv)
 		EXEC_NAME = *argv;
 	fprintf(stderr, "%s v%s\n", EXEC_NAME, VERSION);
-	while ((c = getopt(argc, argv, "c:fh?np:qs:vz:CFTIL:QVl")) != EOF)
+	while ((c = getopt(argc, argv, "c:fH:h?np:qS:s:vz:CFTIL:QVl")) != EOF)
 		switch (c) {
 		case 'n':
 			opts.no_action = 1;

Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ntfscmp.c	25 Sep 2005 19:35:56 -0000	1.3
+++ ntfscmp.c	30 Sep 2005 19:24:13 -0000	1.4
@@ -122,6 +122,7 @@ static int err_exit(const char *fmt, ...
 	exit(1);
 }
 
+#ifdef DEBUG
 /**
  * perr_exit
  *
@@ -144,6 +145,7 @@ static int perr_exit(const char *fmt, ..
 	fflush(stderr);
 	exit(1);
 }
+#endif /* DEBUG */
 
 /**
  * usage - Print a list of the parameters to the program