Changeset da60ba9

Timestamp:

Sep 25, 2009, 6:08:24 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

7b4d90e

Parents:

dbe172d

Message:

Cause unsub to warn user if user wasn't subbed

Add a return value to owl_util_file_deleteline and use it to warn the
user appropriately on unsub. Fixes #35.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• util.c (modified) (6 diffs)
• zephyr.c (modified) (2 diffs)

util.c

@@ -557 +557 @@
  * inefficient impelementation which reads the entire file into
  * memory.
+ *
+ * Returns the number of lines removed
  */
-void owl_util_file_deleteline(const char *filename, const char *line, int backup)
+int owl_util_file_deleteline(const char *filename, const char *line, int backup)
 {
   char buff[LINE], *text;
@@ -564 +566 @@
   FILE *file, *backupfile=NULL;
   int size, newline;
+  int numremoved = 0;
 
   /* open the file for reading */
@@ -569 +572 @@
   if (!file) {
     owl_function_error("Error opening file %s", filename);
-    return;
+    return 0;
   }
 
@@ -580 +583 @@
       owl_free(backupfilename);
       fclose(file);
-      return;
+      return 0;
     }
   }
@@ -604 +607 @@
       strcat(text, buff);
       if (newline) strcat(text, "\n");
+    } else {
+      numremoved++;
     }
 
@@ -628 +633 @@
     owl_free(backupfilename);
   owl_free(text);
+
+  return numremoved;
 }
 

zephyr.c

@@ -993 +993 @@
 #ifdef HAVE_LIBZEPHYR
   char *line, *subsfile;
+  int linesdeleted;
   
   line=owl_zephyr_makesubline(class, inst, recip);
@@ -1003 +1004 @@
   }
   
-  owl_util_file_deleteline(subsfile, line, 1);
+  linesdeleted = owl_util_file_deleteline(subsfile, line, 1);
+  if (linesdeleted > 0) {
+    owl_function_makemsg("Subscription removed");
+  } else {
+    owl_function_error("No subscription present in %s", subsfile);
+  }
   owl_free(subsfile);
   owl_free(line);
-  owl_function_makemsg("Subscription removed");
 #endif
 }