[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs utils.c,1.55,1.56

[Szabolcs S. <sz...@us...>]

Changes by: szaka

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

Modified Files:
	utils.c 
Log Message:
Working with regular files needs no longer --force, except for mkntfs


Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- utils.c	26 Oct 2005 20:48:00 -0000	1.55
+++ utils.c	27 Oct 2005 18:45:45 -0000	1.56
@@ -133,10 +133,12 @@ int utils_valid_device(const char *name,
 		return 0;
 	}
 
-	if (!S_ISBLK(st.st_mode)) {
-		ntfs_log_warning("%s is not a block device.\n", name);
+	if (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode)) {
+		ntfs_log_warning("%s is not a block device, "
+				 "nor regular file.\n", name);
 		if (!force) {
-			ntfs_log_error("Use the force option to work with files.\n");
+			ntfs_log_error("Use the force option to work with other"
+				       " file types, for your own risk!\n");
 			return 0;
 		}
 		ntfs_log_warning("Forced to continue.\n");