[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs cluster.c,1.8,1.9 ntfsmove.c,1.17,1.18 utils.c,1.50,1.51

[Richard R. <fl...@us...>]

Changes by: flatcap

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

Modified Files:
	cluster.c ntfsmove.c utils.c 
Log Message:
prevent a few name clashes with the new rm code


Index: cluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/cluster.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cluster.c	28 Sep 2005 13:47:48 -0000	1.8
+++ cluster.c	16 Oct 2005 22:37:48 -0000	1.9
@@ -36,10 +36,12 @@
 #include "cluster.h"
 #include "utils.h"
 
-#define RED	""
-#define YELLOW	""
-#define GREEN	""
-#define NORM	""
+#if 0
+#define RED	"\e[31m"
+#define YELLOW	"\e[33m"
+#define GREEN	"\e[01;32m"
+#define NORM	"\e[0m"
+#endif
 
 /**
  * cluster_find
@@ -78,7 +80,8 @@ int cluster_find (ntfs_volume *vol, LCN 
 	m_ctx->flags_search = FEMR_IN_USE | FEMR_BASE_RECORD;
 
 	while (mft_next_record (m_ctx) == 0) {
-		Qprintf (RED "Inode: %llu\n" NORM, (unsigned long long)
+		//Qprintf (RED "Inode: %llu\n" NORM, (unsigned long long)
+		Qprintf ("Inode: %llu\n", (unsigned long long)
 				m_ctx->inode->mft_no);
 
 		if (!(m_ctx->flags_match & FEMR_BASE_RECORD))

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsmove.c	7 Oct 2005 14:10:57 -0000	1.17
+++ ntfsmove.c	16 Oct 2005 22:37:48 -0000	1.18
@@ -54,10 +54,12 @@ GEN_PRINTF (Eprintf, stderr, NULL,      
 GEN_PRINTF (Vprintf, stdout, &opts.verbose, TRUE)
 GEN_PRINTF (Qprintf, stdout, &opts.quiet,   FALSE)
 
-#define RED	""
-#define YELLOW	""
-#define GREEN	""
-#define NORM	""
+#if 0
+#define RED	"\e[31m"
+#define YELLOW	"\e[33m"
+#define GREEN	"\e[01;32m"
+#define NORM	"\e[0m"
+#endif
 
 /**
  * version - Print version information about the program
@@ -362,12 +364,12 @@ static int calc_attr_length (ATTR_RECORD
 static void dump_runs (u8 *buffer, int len)
 {
 	int i;
-	printf ("RUN: ");
+	printf ("RUN: \e[01;31m");
 
 	for (i = 0; i < len; i++) {
 		printf (" %02x", buffer[i]);
 	}
-	printf ("\n");
+	printf ("\e[0m\n");
 }
 
 #endif /* if 0 */
@@ -700,7 +702,8 @@ static s64 move_datarun (ntfs_volume *vo
 	need_from = calc_attr_length (rec, need_from);
 	need_to   = calc_attr_length (rec, need_to);
 
-	printf (RED "Before %d, after %d\n" NORM, need_from, need_to);
+	//printf (RED "Before %d, after %d\n" NORM, need_from, need_to);
+	printf ("Before %d, after %d\n", need_from, need_to);
 
 	if (need_from != need_to) {
 		if (resize_nonres_attr (ino->mrec, rec, need_to) < 0) {

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- utils.c	16 Oct 2005 19:21:47 -0000	1.50
+++ utils.c	16 Oct 2005 22:37:48 -0000	1.51
@@ -802,9 +802,9 @@ void utils_dump_mem (void *buf, int star
 		if (flags & DM_INDENT)
 			printf ("\t");
 		if (flags & DM_BOLD)
-			printf ("");
+			printf ("\e[01m");
 		if (flags & (DM_RED | DM_BLUE | DM_GREEN | DM_BOLD))
-			printf ("[%dm", col);
+			printf ("\e[%dm", col);
 		if (off == s)
 			printf("%6.6x ", start);
 		else
@@ -830,7 +830,7 @@ void utils_dump_mem (void *buf, int star
 			}
 		}
 		if (flags & (DM_RED | DM_BLUE | DM_GREEN | DM_BOLD))
-			printf ("");
+			printf ("\e[0m");
 		printf ("\n");
 	}
 }