-This line, and those below, will be ignored--

M    src/diff.c
M    src/package.c
M    src/syrep.ggo
M    src/makepatch.c


git-svn-id: file:///home/lennart/svn/public/syrep/trunk@23 07ea20a6-d2c5-0310-9e02-9ef735347d72

4 files changed, 20 insertions, 10 deletions

diff --git a/src/diff.c b/src/diff.c
index 1be9c63..5bcbde5 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -313,7 +313,7 @@ static int list_cb(DB *ddb, struct syrep_name *name, struct diff_entry *de, void
             
             d[32] = 0;
             
-            fprintf(stderr, "COPY <%s|%s> FROM %c TO %c\n", d, name->path, src, dst);
+            printf("COPY <%s|%s> FROM %c TO %c\n", d, name->path, src, dst);
             break;
         }
             
@@ -331,7 +331,7 @@ static int list_cb(DB *ddb, struct syrep_name *name, struct diff_entry *de, void
             
             d[32] = 0;
             
-            fprintf(stderr, "DELETE <%s|%s> FROM %c\n", d, name->path, rep);
+            printf("DELETE <%s|%s> FROM %c\n", d, name->path, rep);
             break;
             
         }
@@ -344,7 +344,7 @@ static int list_cb(DB *ddb, struct syrep_name *name, struct diff_entry *de, void
             
             d1[32] = d2[32] = 0;
             
-            fprintf(stderr, "CONFLICT <%s> BETWEEN <%s> IN A AND <%s> IN B\n", name->path, d1, d2);
+            printf("CONFLICT <%s> BETWEEN <%s> IN A AND <%s> IN B\n", name->path, d1, d2);
             break;
         }
     }
diff --git a/src/makepatch.c b/src/makepatch.c
index 6e350f5..278cd38 100644
--- a/src/makepatch.c
+++ b/src/makepatch.c
@@ -79,7 +79,8 @@ static int cb(DB *ddb, struct syrep_name *name, struct diff_entry *de, void *p)
 
     if (!package_get_item(cb_info->c1->package, d, 0)) {
 
-        fprintf(stderr, "Adding %s (%s) to patch.\n", name->path, d);
+        if (args.verbose_flag)
+            fprintf(stderr, "Adding %s (%s) to patch.\n", name->path, d);
         
         if (package_add_file(cb_info->c1->package, d, path) < 0)
             return -1;
diff --git a/src/package.c b/src/package.c
index 63ca432..558b1be 100644
--- a/src/package.c
+++ b/src/package.c
@@ -397,6 +397,7 @@ static int read_item(struct package *p) {
     if (p->read_fd < 0)
         return 0;
 
+    name[PACKAGE_ITEMNAMELEN] = 0;
     if ((r = package_read(p, name, PACKAGE_ITEMNAMELEN)) != PACKAGE_ITEMNAMELEN) {
         if (r == 0) {
             close_read_fd(p);
@@ -482,7 +483,7 @@ static int write_item(struct package *p, struct package_item *i) {
     strncpy(name, i->name, PACKAGE_ITEMNAMELEN);
     
     if (args.verbose_flag)
-        fprintf(stderr, "Writing %s (%llu bytes) to package.\n", name, l);
+        fprintf(stderr, "Writing %s (%llu bytes) to package.\n", i->name, l);
 
     if ((r = package_write(p, name, PACKAGE_ITEMNAMELEN)) != PACKAGE_ITEMNAMELEN) {
         if (r >= 0)
@@ -613,8 +614,15 @@ static int load_complete(struct package *p) {
     if (p->read_fd < 0)
         return 0;
 
-    while ((r = read_item(p)) > 0)
+    while ((r = read_item(p)) > 0) {
         rotdash();
+
+        if (interrupted) {
+            rotdash_hide();
+            fprintf(stderr, "Canceled.\n");
+            return -1;
+        }
+    }
         
     rotdash_hide();
     
@@ -679,6 +687,11 @@ int package_save(struct package *p, const char *fn) {
             goto finish;
 
         rotdash();
+
+        if (interrupted) {
+            fprintf(stderr, "Canceled.\n");
+            goto finish;
+        }
     }
     
     r = 0;
diff --git a/src/syrep.ggo b/src/syrep.ggo
index e2ce98a..fea530c 100644
--- a/src/syrep.ggo
+++ b/src/syrep.ggo
@@ -25,10 +25,6 @@ option "local-temp" T "Use temporary directory inside repository" flag off
 option "ignore-origin" - "Don't warn if snapshot not local in update, merge, makepatch" flag off
 option "compress" z "Compress snapshots or patches" flag off
 
-#option "version" V "Print version and exit" flag off
-
-#option "help" h "Print help and exit" flag off
-
 option "list" - "List a repository snapshot" flag off
  option "show-deleted" - "list: Show deleted entries of repository snapshot" flag off
  option "show-by-md" - "list: Show files by message digests" flag off