Changeset 5373:7f4711b9b61f for alias.c

Timestamp:

2008-05-14 16:23:52 (6 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Ensure alias file ends with \n before appending new aliases.
Closes #1580.

Files:

• alias.c (modified) (2 diffs)

alias.c

@@ -332 +332 @@
     return;
   mutt_expand_path (buf, sizeof (buf));
-  if ((rc = fopen (buf, "a")))
-  {
+  if ((rc = fopen (buf, "a+")))
+  {
+    /* terminate existing file with \n if necessary */
+    if (fseek (rc, 0, SEEK_END))
+      goto fseek_err;
+    if (ftell(rc) > 0)
+    {
+      if (fseek (rc, -1, SEEK_CUR) < 0)
+        goto fseek_err;
+      if (fread(buf, 1, 1, rc) < 0)
+      {
+        mutt_perror (_("Error reading alias file"));
+        return;
+      }
+      if (fseek (rc, 0, SEEK_END) < 0)
+        goto fseek_err;
+      if (buf[0] != '\n')
+        fputc ('\n', rc);
+    }
+
     if (mutt_check_alias_name (new->name, NULL))
       mutt_quote_filename (buf, sizeof (buf), new->name);
@@ -348 +366 @@
   else
     mutt_perror (buf);
+
+  return;
+  
+  fseek_err:
+  mutt_perror (_("Error seeking in alias file"));
+  fclose(rc);
+  return;
 }