X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Ffile.c;h=66a2028b90986f49566a8675566009ea6a00ce0d;hp=36d34a3dbf42603d31438f8902793a2cb65d5a76;hb=16536d59024177409f49134c3f03f69855c144b9;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f

diff --git a/lib-lib/file.c b/lib-lib/file.c
index 36d34a3..66a2028 100644
--- a/lib-lib/file.c
+++ b/lib-lib/file.c
@@ -26,19 +26,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include "macros.h"
-#include "mem.h"
-#include "str.h"
-#include "file.h"
-
-#include "../lib/debug.h"
+#include "lib-lib.h"
 
 #ifndef O_NOFOLLOW
 #  define O_NOFOLLOW  0
@@ -76,7 +64,6 @@ int safe_open(const char *path, int flags)
     if (lstat (path, &osb) < 0 || fstat(fd, &nsb) < 0
     ||  compare_stat(&osb, &nsb) == -1)
     {
-        debug_print(1, ("%s is a symlink!\n", path));
         close(fd);
         return -1;
     }
@@ -208,7 +195,7 @@ void mutt_unlink(const char *s)
             char buf[BUFSIZ];
             unlink(s);
 
-            p_clear(buf, sizeof(buf));
+            p_clear(buf, countof(buf));
             while (sb.st_size > 0) {
                 fwrite(buf, 1, MIN(ssizeof(buf), sb.st_size), f);
                 sb.st_size -= MIN(ssizeof(buf), sb.st_size);
@@ -255,14 +242,51 @@ int safe_fclose(FILE **f)
     return r;
 }
 
+/* If rfc1524_expand_command() is used on a recv'd message, then
+ * the filename doesn't exist yet, but if its used while sending a message,
+ * then we need to rename the existing file.
+ *
+ * This function returns 0 on successful move, 1 on old file doesn't exist,
+ * 2 on new file already exists, and 3 on other failure.
+ */
+
+/* note on access(2) use: No dangling symlink problems here due to
+ * safe_fopen().
+ */
+int mutt_rename_file(char *oldfile, char *newfile)
+{
+    FILE *ofp, *nfp;
+
+    if (access(oldfile, F_OK) != 0)
+        return 1;
+    if (access(newfile, F_OK) == 0)
+        return 2;
+
+    ofp = fopen(oldfile, "r");
+    if (!ofp)
+        return 3;
+
+    nfp = safe_fopen(newfile, "w");
+    if (!nfp) {
+        fclose (ofp);
+        return 3;
+    }
+
+    mutt_copy_stream(ofp, nfp);
+    fclose(nfp);
+    fclose(ofp);
+    mutt_unlink(oldfile);
+    return 0;
+}
+
 /* Read a line from ``fp'' into the dynamically allocated ``s'',
  * increasing ``s'' if necessary. The ending "\n" or "\r\n" is removed.
  * If a line ends with "\", this char and the linefeed is removed,
  * and the next line is read too.
  */
-char *mutt_read_line(char *s, size_t *size, FILE * fp, int *line)
+char *mutt_read_line(char *s, ssize_t *size, FILE * fp, int *line)
 {
-    size_t offset = 0;
+    ssize_t offset = 0;
     char *ch;
 
     if (!s) {
@@ -311,7 +335,7 @@ int mutt_copy_stream(FILE *fin, FILE *fout)
     char buf[BUFSIZ];
     size_t l;
 
-    while ((l = fread(buf, 1, sizeof (buf), fin)) > 0) {
+    while ((l = fread(buf, 1, sizeof(buf), fin)) > 0) {
         if (fwrite(buf, 1, l, fout) != l)
             return -1;
     }
@@ -319,17 +343,16 @@ int mutt_copy_stream(FILE *fin, FILE *fout)
     return 0;
 }
 
-int mutt_copy_bytes(FILE *in, FILE *out, size_t size)
+int mutt_copy_bytes(FILE *in, FILE *out, ssize_t size)
 {
     char buf[BUFSIZ];
 
     while (size > 0) {
-        size_t chunk = MIN(size, sizeof(buf));
+        size_t chunk = MIN(size, ssizeof(buf));
 
         if ((chunk = fread(buf, 1, chunk, in)) < 1)
             break;
         if (fwrite(buf, 1, chunk, out) != chunk) {
-            debug_print(1, ("fwrite() returned short byte count\n"));
             return -1;
         }
         size -= chunk;