Changeset ed88113

Timestamp:

Oct 16, 2009, 10:25:39 AM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

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

Children:

49d67b1

Parents:

a006a662 (diff), 946058b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'rewrite_deleteline'

Files:

• util.c (modified) (3 diffs)
• commands.c (modified) (1 diff)

util.c

@@ -552 +552 @@
 }
 
-/* Delete the line matching "line" from the named file.  If no such
- * line is found the file is left intact.  If backup==1 then create a
- * backupfile containing the original contents.  This is an
- * inefficient impelementation which reads the entire file into
- * memory.
+/* Delete all lines matching "line" from the named file.  If no such
+ * line is found the file is left intact.  If backup==1 then leave a
+ * backup file containing the original contents.  The match is
+ * case-insensitive.
  *
  * Returns the number of lines removed
@@ -562 +561 @@
 int owl_util_file_deleteline(const char *filename, const char *line, int backup)
 {
-  char buff[LINE], *text;
-  char *backupfilename=NULL;
-  FILE *file, *backupfile=NULL;
-  int size, newline;
+  char *backupfile, *newfile, *buf = NULL;
+  FILE *old, *new;
+  struct stat st;
   int numremoved = 0;
 
-  /* open the file for reading */
-  file=fopen(filename, "r");
-  if (!file) {
-    owl_function_error("Error opening file %s", filename);
+  if ((old = fopen(filename, "r")) == NULL) {
+    owl_function_error("Cannot open %s (for reading): %s",
+                       filename, strerror(errno));
     return 0;
   }
 
-  /* open the backup file for writing */
+  if (fstat(fileno(old), &st) != 0) {
+    owl_function_error("Cannot stat %s: %s", filename, strerror(errno));
+    return 0;
+  }
+
+  newfile = owl_sprintf("%s.new", filename);
+  if ((new = fopen(newfile, "w")) == NULL) {
+    owl_function_error("Cannot open %s (for writing): %s",
+                       filename, strerror(errno));
+    free(newfile);
+    fclose(old);
+    return 0;
+  }
+
+  if (fchmod(fileno(new), st.st_mode & 0777) != 0) {
+    owl_function_error("Cannot set permissions on %s: %s",
+                       filename, strerror(errno));
+    unlink(newfile);
+    fclose(new);
+    free(newfile);
+    fclose(old);
+    return 0;
+  }
+
+  while (owl_getline_chomp(&buf, old))
+    if (strcasecmp(buf, line) != 0)
+      fprintf(new, "%s\n", buf);
+    else
+      numremoved++;
+
+  fclose(new);
+  fclose(old);
+
   if (backup) {
-    backupfilename=owl_sprintf("%s.backup", filename);
-    backupfile=fopen(backupfilename, "w");
-    if (!backupfile) {
-      owl_function_error("Error opening file %s for writing", backupfilename);
-      owl_free(backupfilename);
-      fclose(file);
+    backupfile = owl_sprintf("%s.backup", filename);
+    unlink(backupfile);
+    if (link(filename, backupfile) != 0) {
+      owl_function_error("Cannot link %s: %s", backupfile, strerror(errno));
+      owl_free(backupfile);
+      unlink(newfile);
+      owl_free(newfile);
       return 0;
     }
-  }
-
-  /* we'll read the entire file into memory, minus the line we don't want and
-   * and at the same time create the backup file if necessary
-   */
-  text=owl_malloc(LINE);
-  strcpy(text, "");
-  size=LINE;
-  while (fgets(buff, LINE, file)!=NULL) {
-    /* strip the newline */
-    newline=0;
-    if (buff[0] != '\0' && buff[strlen(buff) - 1] == '\n') {
-      buff[strlen(buff)-1]='\0';
-      newline=1;
-    }
-    
-    /* if we don't match the line, add to saved text in memory */
-    if (strcasecmp(buff, line)) {
-      size+=LINE;
-      text=owl_realloc(text, size);
-      strcat(text, buff);
-      if (newline) strcat(text, "\n");
-    } else {
-      numremoved++;
-    }
-
-    /* write to backupfile if necessary */
-    if (backup) {
-      fputs(buff, backupfile);
-      if (newline) fputs("\n", backupfile);
-    }
-  }
-  if (backup) fclose(backupfile);
-  fclose(file);
-
-  /* now rewrite the original file from memory */
-  file=fopen(filename, "w");
-  if (!file) {
-    owl_function_error("WARNING: Error opening %s for writing.  Use %s to restore.", filename, backupfilename);
-    owl_function_beep();
-  } else {
-    fputs(text, file);
-    fclose(file);
-  }
-
-  if (backup)
-    owl_free(backupfilename);
-  owl_free(text);
+    owl_free(backupfile);
+  }
+
+  if (rename(newfile, filename) != 0) {
+    owl_function_error("Cannot move %s to %s: %s",
+                       newfile, filename, strerror(errno));
+    numremoved = 0;
+  }
+
+  unlink(newfile);
+  owl_free(newfile);
 
   return numremoved;
@@ -781 +774 @@
   return g_string_free(out, 0);
 }
+
+/* innards of owl_getline{,_chomp} below */
+static int owl_getline_internal(char **s, FILE *fp, int newline)
+{
+  int size = 0;
+  int target = 0;
+  int count = 0;
+  int c;
+
+  while (1) {
+    c = getc(fp);
+    if ((target + 1) > size) {
+      size += BUFSIZ;
+      *s = owl_realloc(*s, size);
+    }
+    if (c == EOF)
+      break;
+    count++;
+    if (c != '\n' || newline)
+        (*s)[target++] = c;
+    if (c == '\n')
+      break;
+  }
+  (*s)[target] = 0;
+
+  return count;
+}
+
+/* Read a line from fp, allocating memory to hold it, returning the number of
+ * byte read.  *s should either be NULL or a pointer to memory allocated with
+ * owl_malloc; it will be owl_realloc'd as appropriate.  The caller must
+ * eventually free it.  (This is roughly the interface of getline in the gnu
+ * libc).
+ *
+ * The final newline will be included if it's there.
+ */
+int owl_getline(char **s, FILE *fp)
+{
+  return owl_getline_internal(s, fp, 1);
+}
+
+/* As above, but omitting the final newline */
+int owl_getline_chomp(char **s, FILE *fp)
+{
+  return owl_getline_internal(s, fp, 0);
+}
+
+/* Read the rest of the input available in fp into a string. */
+char *owl_slurp(FILE *fp)
+{
+  char *buf = NULL;
+  char *p;
+  int size = 0;
+  int count;
+
+  while (1) {
+    buf = owl_realloc(buf, size + BUFSIZ);
+    p = &buf[size];
+    size += BUFSIZ;
+
+    if ((count = fread(p, 1, BUFSIZ, fp)) < BUFSIZ)
+      break;
+  }
+  p[count] = 0;
+
+  return buf;
+}

commands.c

@@ -86 +86 @@
               "creates a binding in a keymap",
               "bindkey <keymap> <keyseq> command <command>",
+              "(Note: There is a literal word "command" between <keyseq>\n"
+              " and <command>.)\n"
               "Binds a key sequence to a command within a keymap.\n"
               "Use 'show keymaps' to see the existing keymaps.\n"
-              "Key sequences may be things like M-C-t or NPAGE.\n"),
+              "Key sequences may be things like M-C-t or NPAGE.\n\n"
+              "Ex.: bindkey recv C-b command zwrite -c barnowl"),
 
   OWLCMD_ARGS("zwrite", owl_command_zwrite, OWL_CTX_INTERACTIVE,