[ntfs-3g-cvs] ntfs-3g/src ntfs-3g.c, 1.64.2.82, 1.64.2.83 utils.c, 1.13.2.5, 1.13.2.6

[Jean-Pierre A. <jp...@us...>]

Update of /cvsroot/ntfs-3g/ntfs-3g/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15152/ntfs-3g/src

Modified Files:
      Tag: PERMISSION_HANDLING_BRANCH
	ntfs-3g.c utils.c 
Log Message:
Adapted to ntfs-3g.1.5130


Index: utils.c
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/src/utils.c,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -d -r1.13.2.5 -r1.13.2.6
--- utils.c	14 May 2008 08:27:55 -0000	1.13.2.5
+++ utils.c	1 Dec 2008 15:29:23 -0000	1.13.2.6
@@ -66,7 +66,7 @@
 "mount the volume read-write with the 'remove_hiberfile' mount option.\n"
 "For example type on the command line:\n"
 "\n"
-"            mount -t ntfs-3g %s %s -o remove_hiberfile\n"
+"            mount -t ntfs-3g -o remove_hiberfile %s %s\n"
 "\n";
 
 static const char *unclean_journal_msg =
@@ -97,7 +97,7 @@
 
 static const char *forced_mount_msg =
 "\n"
-"            mount -t ntfs-3g %s %s -o force\n"
+"            mount -t ntfs-3g -o force %s %s\n"
 "\n"
 "    Or add the option to the relevant row in the /etc/fstab file:\n"
 "\n"
@@ -133,7 +133,7 @@
 			ntfs_log_error(hibernated_volume_msg, volume, mntpoint);
 			break;
 		case NTFS_VOLUME_UNCLEAN_UNMOUNT:
-			ntfs_log_error(unclean_journal_msg);
+			ntfs_log_error("%s", unclean_journal_msg);
 			ntfs_log_error(forced_mount_msg, volume, mntpoint, 
 				       volume, mntpoint);
 			break;

Index: ntfs-3g.c
===================================================================
RCS file: /cvsroot/ntfs-3g/ntfs-3g/src/ntfs-3g.c,v
retrieving revision 1.64.2.82
retrieving revision 1.64.2.83
diff -u -d -r1.64.2.82 -r1.64.2.83
--- ntfs-3g.c	1 Dec 2008 14:49:40 -0000	1.64.2.82
+++ ntfs-3g.c	1 Dec 2008 15:29:23 -0000	1.64.2.83
@@ -91,7 +91,6 @@
 #include "layout.h"
 #include "index.h"
 #include "utils.h"
-#include "version.h"
 #include "ntfstime.h"
 #include "security.h"
 #include "reparse.h"
@@ -175,13 +174,13 @@
 "Copyright (C) 2005-2007 Yura Pakhuchiy\n"
 "Copyright (C) 2007-2008 Jean-Pierre Andre\n"
 "\n"
-"Usage:    %s <device|image_file> <mount_point> [-o option[,...]]\n"
+"Usage:    %s [-o option[,...]] <device|image_file> <mount_point>\n"
 "\n"
 "Options:  ro (read-only mount), force, remove_hiberfile, locale=,\n" 
 "          uid=, gid=, umask=, fmask=, dmask=, streams_interface=.\n"
 "          Please see the details in the manual.\n"
 "\n"
-"Example:  ntfs-3g /dev/sda1 /mnt/win -o force\n"
+"Examples: ntfs-3g -o force /dev/sda1 /mnt/windows\n"
 "\n"
 "%s";
 
@@ -2776,7 +2775,7 @@
 		if (mknod(dev, S_IFCHR | 0666, makedev(10, 229))) {
 			ntfs_log_perror("Failed to create '%s'", dev);
 			if (errno == EPERM)
-				ntfs_log_error(dev_fuse_msg);
+				ntfs_log_error("%s", dev_fuse_msg);
 		}
 		umask(mask);
 	}
@@ -3109,7 +3108,7 @@
 
 #if defined(linux) || defined(__uClinux__)
 	if (S_ISBLK(sbuf.st_mode) && (fstype == FSTYPE_FUSE))
-		ntfs_log_info(fuse26_kmod_msg);
+		ntfs_log_info("%s", fuse26_kmod_msg);
 #endif	
 	setup_logging(parsed_options);
 	if (failed_secure)