Changeset 3012 in kBuild

Timestamp:

Nov 7, 2016 11:53:11 AM (8 years ago)

Author:

bird

Message:

kDuplicates -> kDeDup

Location:

trunk/src/kDuplicates

Files:

• Makefile.kmk (modified) (2 diffs)
• kDeDup.c (moved) (moved from trunk/src/kDuplicates/kDuplicates.c ) (19 diffs)

trunk/src/kDuplicates/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-makefile for kDuplicates.
+# Sub-makefile for kDeDup.
 #
 
@@ -27 +27 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-PROGRAMS += kDuplicates
-kDuplicates_TEMPLATE        = BIN
-kDuplicates_LIBS            = $(LIB_KUTIL)
-kDuplicates_SOURCES         = kDuplicates.c
+PROGRAMS += kDeDup
+kDeDup_TEMPLATE        = BIN
+kDeDup_LIBS            = $(LIB_KUTIL)
+kDeDup_SOURCES         = kDeDup.c
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/kDuplicates/kDeDup.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * kDuplicate - Utility that finds duplicate files.
+ * kDeDup - Utility that finds duplicate files, optionally hardlinking them.
  */
 
@@ -217 +217 @@
     if (pvRet)
         return pvRet;
-    fprintf(stderr, "kDuplicate: error: out of memory! (cb=%#z)\n", cb);
+    fprintf(stderr, "kDeDup: error: out of memory! (cb=%#z)\n", cb);
     return NULL;
 }
@@ -282 +282 @@
             else if (rcNt != STATUS_END_OF_FILE)
             {
-                fprintf(stderr, "kDuplicate: warning: Error reading '%ls': %#x\n", pFileNode->wszPath, rcNt);
+                fprintf(stderr, "kDeDup: warning: Error reading '%ls': %#x\n", pFileNode->wszPath, rcNt);
                 break;
             }
@@ -301 +301 @@
     }
     else
-        fprintf(stderr, "kDuplicate: warning: Failed to open '%ls': %s (%d)\n", pFileNode->wszPath, strerror(errno), errno);
+        fprintf(stderr, "kDeDup: warning: Failed to open '%ls': %s (%d)\n", pFileNode->wszPath, strerror(errno), errno);
 
     /*
@@ -486 +486 @@
                         if (rcExit == 0)
                             continue;
-                        fprintf(stderr, "kDuplicate: internal error: nt_fts_set failed!\n");
+                        fprintf(stderr, "kDeDup: internal error: nt_fts_set failed!\n");
                         rcExit = 1;
                         break;
@@ -504 +504 @@
                             if (rcExit == 0)
                                 continue;
-                            fprintf(stderr, "kDuplicate: internal error: nt_fts_set failed!\n");
+                            fprintf(stderr, "kDeDup: internal error: nt_fts_set failed!\n");
                             rcExit = 1;
                         }
@@ -510 +510 @@
 
                     case FTS_DC:
-                        fprintf(stderr, "kDuplicate: warning: Ignoring cycle '%ls'!\n", pFtsEnt->fts_wcsaccpath);
+                        fprintf(stderr, "kDeDup: warning: Ignoring cycle '%ls'!\n", pFtsEnt->fts_wcsaccpath);
                         continue;
 
                     case FTS_NS:
-                        fprintf(stderr, "kDuplicate: warning: Failed to stat '%ls': %s (%d)\n",
+                        fprintf(stderr, "kDeDup: warning: Failed to stat '%ls': %s (%d)\n",
                                 pFtsEnt->fts_wcsaccpath, strerror(pFtsEnt->fts_errno), pFtsEnt->fts_errno);
                         continue;
 
                     case FTS_DNR:
-                        fprintf(stderr, "kDuplicate: error: Error reading directory '%ls': %s (%d)\n",
+                        fprintf(stderr, "kDeDup: error: Error reading directory '%ls': %s (%d)\n",
                                 pFtsEnt->fts_wcsaccpath, strerror(pFtsEnt->fts_errno), pFtsEnt->fts_errno);
                         rcExit = 1;
@@ -525 +525 @@
 
                     case FTS_ERR:
-                        fprintf(stderr, "kDuplicate: error: Error on '%ls': %s (%d)\n",
+                        fprintf(stderr, "kDeDup: error: Error on '%ls': %s (%d)\n",
                                 pFtsEnt->fts_wcsaccpath, strerror(pFtsEnt->fts_errno), pFtsEnt->fts_errno);
                         rcExit = 1;
@@ -538 +538 @@
                     /* Not supposed to get here. */
                     default:
-                        fprintf(stderr, "kDuplicate: internal error: fts_info=%d - '%ls'\n",
+                        fprintf(stderr, "kDeDup: internal error: fts_info=%d - '%ls'\n",
                                 pFtsEnt->fts_info, pFtsEnt->fts_wcsaccpath);
                         rcExit = 1;
@@ -548 +548 @@
             else
             {
-                fprintf(stderr, "kDuplicate: error: nt_fts_read failed: %s (%d)\n", strerror(errno), errno);
+                fprintf(stderr, "kDeDup: error: nt_fts_read failed: %s (%d)\n", strerror(errno), errno);
                 rcExit = 1;
                 break;
@@ -556 +556 @@
         if (nt_fts_close(pFts) != 0)
         {
-            fprintf(stderr, "kDuplicate: error: nt_fts_close failed: %s (%d)\n", strerror(errno), errno);
+            fprintf(stderr, "kDeDup: error: nt_fts_close failed: %s (%d)\n", strerror(errno), errno);
             rcExit = 1;
         }
@@ -562 +562 @@
     else
     {
-        fprintf(stderr, "kDuplicate: error: nt_fts_openw failed: %s (%d)\n", strerror(errno), errno);
+        fprintf(stderr, "kDeDup: error: nt_fts_openw failed: %s (%d)\n", strerror(errno), errno);
         rcExit = 1;
     }
@@ -612 +612 @@
                                 else
                                 {
-                                    fprintf(stderr, "kDuplicate: fatal: failed to delete '%ls' after hardlinking: %s (%d)\n",
+                                    fprintf(stderr, "kDeDup: fatal: failed to delete '%ls' after hardlinking: %s (%d)\n",
                                             wszBackup, strerror(errno), errno);
                                     return 8;
@@ -619 +619 @@
                             else
                             {
-                                fprintf(stderr, "kDuplicate: error: failed to hard link '%ls' to '%ls': %u\n",
+                                fprintf(stderr, "kDeDup: error: failed to hard link '%ls' to '%ls': %u\n",
                                         pDupFile->wszPath, wszBackup, GetLastError());
                                 if (!MoveFileW(wszBackup, pDupFile->wszPath))
                                 {
-                                    fprintf(stderr, "kDuplicate: fatal: Restore back '%ls' to '%ls' after hardlinking faild: %u\n",
+                                    fprintf(stderr, "kDeDup: fatal: Restore back '%ls' to '%ls' after hardlinking faild: %u\n",
                                             wszBackup, pDupFile->wszPath, GetLastError());
                                     return 8;
@@ -632 +632 @@
                         else
                         {
-                            fprintf(stderr, "kDuplicate: error: failed to rename '%ls' to '%ls': %u\n",
+                            fprintf(stderr, "kDeDup: error: failed to rename '%ls' to '%ls': %u\n",
                                     pDupFile->wszPath, wszBackup, GetLastError());
                             rcExit = 1;
@@ -639 +639 @@
                     else
                     {
-                        fprintf(stderr, "kDuplicate: error: too long backup path: '%ls'\n", pDupFile->wszPath);
+                        fprintf(stderr, "kDeDup: error: too long backup path: '%ls'\n", pDupFile->wszPath);
                         rcExit = 1;
                     }
@@ -752 +752 @@
                 else
                 {
-                    fprintf(stderr, "kDuplicate: syntax error: Unknown option '--%ls'\n", pwszArg);
+                    fprintf(stderr, "kDeDup: syntax error: Unknown option '--%ls'\n", pwszArg);
                     return 2;
                 }
@@ -793 +793 @@
                     case 'h':
                     case '?':
-                        return usage("kDuplicate", stdout);
+                        return usage("kDeDup", stdout);
 
                     case 'V':
@@ -800 +800 @@
 
                     default:
-                        fprintf(stderr, "kDuplicate: syntax error: Unknown option '-%lc'\n", wcOpt);
+                        fprintf(stderr, "kDeDup: syntax error: Unknown option '-%lc'\n", wcOpt);
                         return 2;
                 }