Add some missing #include statements.

[cumulus.git] / scandir.cc

diff --git a/scandir.cc b/scandir.cc
index d462432..e82a918 100644 (file)
--- a/scandir.cc
+++ b/scandir.cc
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <sys/types.h>
@@ -59,12 +60,12 @@ using std::vector;
 using std::ostream;
 
 /* Version information.  This will be filled in by the Makefile. */
-#ifndef LBS_VERSION
-#define LBS_VERSION Unknown
+#ifndef CUMULUS_VERSION
+#define CUMULUS_VERSION Unknown
 #endif
-#define LBS_STRINGIFY(s) LBS_STRINGIFY2(s)
-#define LBS_STRINGIFY2(s) #s
-static const char lbs_version[] = LBS_STRINGIFY(LBS_VERSION);
+#define CUMULUS_STRINGIFY(s) CUMULUS_STRINGIFY2(s)
+#define CUMULUS_STRINGIFY2(s) #s
+static const char cumulus_version[] = CUMULUS_STRINGIFY(CUMULUS_VERSION);
 
 static RemoteStore *remote = NULL;
 static TarSegmentStore *tss = NULL;
@@ -95,6 +96,9 @@ std::list<string> searches;         // Directories we don't want to save, but
 
 bool relative_paths = true;
 
+/* Whether verbose output is enabled. */
+bool verbose = false;
+
 /* Ensure that the given segment is listed as a dependency of the current
  * snapshot. */
 void add_segment(const string& segment)
@@ -281,7 +285,7 @@ int64_t dumpfile(int fd, dictionary &file_info, const string &path,
         file_info["checksum"] = hash.checksum_str();
     }
 
-    if (status != NULL)
+    if (verbose && status != NULL)
         printf("    [%s]\n", status);
 
     string blocklist = "";
@@ -309,7 +313,8 @@ void dump_inode(const string& path,         // Path within snapshot
     int64_t file_size;
     ssize_t len;
 
-    printf("%s\n", path.c_str());
+    if (verbose)
+        printf("%s\n", path.c_str());
     metawriter->find(path);
 
     file_info["name"] = uri_encode(path);
@@ -580,7 +585,7 @@ void usage(const char *program)
 {
     fprintf(
         stderr,
-        "LBS %s\n\n"
+        "Cumulus %s\n\n"
         "Usage: %s [OPTION]... --dest=DEST PATHS...\n"
         "Produce backup snapshot of files in SOURCE and store to DEST.\n"
         "\n"
@@ -603,9 +608,10 @@ void usage(const char *program)
         "  --intent=FLOAT       intended backup type: 1=daily, 7=weekly, ...\n"
         "                           (defaults to \"1\")\n"
         "  --full-metadata      do not re-use metadata from previous backups\n"
+        "  -v --verbose         list files as they are backed up\n"
         "\n"
         "Exactly one of --dest or --upload-script must be specified.\n",
-        lbs_version, program
+        cumulus_version, program
     );
 }
 
@@ -633,11 +639,13 @@ int main(int argc, char *argv[])
             {"full-metadata", 0, 0, 0},     // 8
             {"tmpdir", 1, 0, 0},            // 9
             {"upload-script", 1, 0, 0},     // 10
+            // Aliases for short options
+            {"verbose", 0, 0, 'v'},
             {NULL, 0, 0, 0},
         };
 
         int long_index;
-        int c = getopt_long(argc, argv, "", long_options, &long_index);
+        int c = getopt_long(argc, argv, "v", long_options, &long_index);
 
         if (c == -1)
             break;
@@ -687,8 +695,14 @@ int main(int argc, char *argv[])
                 return 1;
             }
         } else {
-            usage(argv[0]);
-            return 1;
+            switch (c) {
+            case 'v':
+                verbose = true;
+                break;
+            default:
+                usage(argv[0]);
+                return 1;
+            }
         }
     }
 
@@ -811,6 +825,14 @@ int main(int argc, char *argv[])
         }
     }
     fclose(checksums);
+
+    SHA1Checksum checksum_csum;
+    string csum;
+    checksum_filename = checksum_file->get_local_path();
+    if (checksum_csum.process_file(checksum_filename.c_str())) {
+        csum = checksum_csum.checksum_str();
+    }
+
     checksum_file->send();
 
     db->Close();
@@ -847,7 +869,7 @@ int main(int argc, char *argv[])
     FILE *descriptor = fdopen(descriptor_fd, "w");
 
     fprintf(descriptor, "Format: LBS Snapshot v0.6\n");
-    fprintf(descriptor, "Producer: LBS %s\n", lbs_version);
+    fprintf(descriptor, "Producer: Cumulus %s\n", cumulus_version);
     strftime(desc_buf, sizeof(desc_buf), "%Y-%m-%d %H:%M:%S %z", &time_buf);
     fprintf(descriptor, "Date: %s\n", desc_buf);
     if (backup_scheme.size() > 0)
@@ -855,9 +877,7 @@ int main(int argc, char *argv[])
     fprintf(descriptor, "Backup-Intent: %g\n", snapshot_intent);
     fprintf(descriptor, "Root: %s\n", backup_root.c_str());
 
-    SHA1Checksum checksum_csum;
-    if (checksum_csum.process_file(checksum_filename.c_str())) {
-        string csum = checksum_csum.checksum_str();
+    if (csum.size() > 0) {
         fprintf(descriptor, "Checksums: %s\n", csum.c_str());
     }