Changeset 5fca55f

Timestamp:

Nov 19, 2010, 2:15:34 AM (14 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

950e2da

Parents:

b401ef2

git-author:

Jason Gross <jgross@MIT.EDU> (11/17/10 02:18:47)

git-committer:

Karl Ramm <kcr@1ts.org> (11/19/10 02:15:34)

Message:

I/O errors on writing subscription file in :unsub are no longer clobbered by "No subscription present in..."

owl_util_file_deleteline now returns -1 on error, and owl_zephyr_delsub
now checks linesdeleted == 0 before erroring with "No subscription
present in...".

Additionally, free(filename) corrected to owl_free(filename) in two
places.

Reviewed-By: Karl Ramm <kcr@1ts.org>

Files:

• util.c (modified) (6 diffs)
• zephyr.c (modified) (1 diff)

util.c

@@ -381 +381 @@
  * case-insensitive.
  *
- * Returns the number of lines removed
+ * Returns the number of lines removed on success.  Returns -1 on failure.
  */
 int owl_util_file_deleteline(const char *filename, const char *line, int backup)
@@ -393 +393 @@
     owl_function_error("Cannot open %s (for reading): %s",
                        filename, strerror(errno));
-    return 0;
+    return -1;
   }
 
   if (fstat(fileno(old), &st) != 0) {
     owl_function_error("Cannot stat %s: %s", filename, strerror(errno));
-    return 0;
+    return -1;
   }
 
@@ -405 +405 @@
     owl_function_error("Cannot open %s (for writing): %s",
                        filename, strerror(errno));
-    free(newfile);
+    owl_free(newfile);
     fclose(old);
-    return 0;
+    return -1;
   }
 
@@ -415 +415 @@
     unlink(newfile);
     fclose(new);
-    free(newfile);
+    owl_free(newfile);
     fclose(old);
-    return 0;
+    return -1;
   }
 
@@ -438 +438 @@
       unlink(newfile);
       owl_free(newfile);
-      return 0;
+      return -1;
     }
     owl_free(backupfile);
@@ -446 +446 @@
     owl_function_error("Cannot move %s to %s: %s",
                        newfile, filename, strerror(errno));
-    numremoved = 0;
+    numremoved = -1;
   }
 

zephyr.c

@@ -1012 +1012 @@
   if (linesdeleted > 0) {
     owl_function_makemsg("Subscription removed");
-  } else {
+  } else if (linesdeleted == 0) {
     owl_function_error("No subscription present in %s", subsfile);
   }