Changeset b2a91b6

Timestamp:

Jun 22, 2003, 2:00:25 AM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

73624b4

Parents:

9381782

Message:

Use new function to delete zephyr subs from file

Files:

• ChangeLog (modified) (1 diff)
• config.h.in (modified) (1 diff)
• zephyr.c (modified) (1 diff)

ChangeLog

@@ -9 +9 @@
         Bug fix in using makemsg when no curses window present
         $owl::auth now works
+        Use new function to delete zephyr subs from file
 
 2.0.4-pre-1

config.h.in

@@ -52 +52 @@
 #undef HAVE_DES_KEY_SCHED
 
-#undef HAVE_DES_ECB_ENCRYPT
+#undef HAVE_DES_ECB_ENCRYPT_PROTO
 
 #undef TERMINFO

zephyr.c

@@ -545 +545 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  char *line, subsfile[LINE], buff[LINE], *text;
-  char backupfilename[LINE];
-  FILE *file, *backupfile;
-  int size;
+  char *line, *subsfile;
   
   line=owl_zephyr_makesubline(class, inst, recip);
-
-  /* open the subsfile for reading */
-  if (filename==NULL) {
-    sprintf(subsfile, "%s/%s", owl_global_get_homedir(&g), ".zephyr.subs");
-  } else {
-    strcpy(subsfile, filename);
-  }
-  file=fopen(subsfile, "r");
-  if (!file) {
-    owl_function_makemsg("Error opening file %s", subsfile);
-    owl_free(line);
-    return;
-  }
-
-  /* open the backup file for writing */
-  sprintf(backupfilename, "%s.backup", subsfile);
-  backupfile=fopen(backupfilename, "w");
-  if (!backupfile) {
-    owl_function_makemsg("Error opening file %s for writing", backupfilename);
-    owl_free(line);
-    return;
-  }
-
-  /* we'll read the entire file into memory, minus the line we don't want and
-   * and at the same time create a backup file */
-  text=owl_malloc(LINE);
-  strcpy(text, "");
-  size=LINE;
-  while (fgets(buff, LINE, file)!=NULL) {
-    /* if we don't match the line, add to text */
-    if (strcasecmp(buff, line)) {
-      size+=LINE;
-      text=owl_realloc(text, size);
-      strcat(text, buff);
-    }
-
-    /* write to backupfile */
-    fputs(buff, backupfile);
-  }
-  fclose(backupfile);
-  fclose(file);
-
-  /* now open the original subs file for writing and write out the
-   * subs */
-  file=fopen(subsfile, "w");
-  if (!file) {
-    owl_function_makemsg("WARNING: Error opening %s to rewrite subscriptions.  Use %s to restore", subsfile, backupfilename);
-    owl_function_beep();
-    owl_free(line);
-    return;
-  }
-
-  fputs(text, file);
-  fclose(file);
+  line[strlen(line)-1]='\0';
+
+  if (!filename) {
+    subsfile=owl_sprintf("%s/.zephyr.subs", owl_global_get_homedir(&g));
+  } else {
+    subsfile=owl_strdup(filename);
+  }
+  
+  owl_util_file_deleteline(subsfile, line, 1);
+  owl_free(subsfile);
   owl_free(line);
-
   owl_function_makemsg("Subscription removed");
 #endif
 }
 
+/* caller must free the return */
 char *owl_zephyr_makesubline(char *class, char *inst, char *recip)
 {
-  /* caller must free the return */
   char *out;