move more functions in file.c

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 185a878..1f6b751 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -12,7 +12,6 @@
 
 #include <grp.h>
 #include <pwd.h>
-#include <utime.h>
 
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
@@ -233,14 +232,6 @@ void mutt_pretty_mailbox (char *s)
   }
 }
 
-void
-mutt_expand_file_fmt(char *dst, ssize_t n, const char *fmt, const char *src)
-{
-    char tmp[LONG_STRING];
-    mutt_quote_filename(tmp, sizeof(tmp), src);
-    m_file_fmt(dst, n, fmt, tmp);
-}
-
 /* return 0 on success, -1 on abort, 1 on error */
 int mutt_check_overwrite (const char *attname, const char *path,
                           char *fname, ssize_t flen, int *append,
@@ -613,29 +604,6 @@ void mutt_sleep (short s)
     sleep(MAX(s, SleepTime));
 }
 
-/* Decrease a file's modification time by 1 second */
-time_t mutt_decrease_mtime (const char *f, struct stat *st)
-{
-  struct utimbuf utim;
-  struct stat _st;
-  time_t mtime;
-
-  if (!st) {
-    if (stat (f, &_st) == -1)
-      return -1;
-    st = &_st;
-  }
-
-  if ((mtime = st->st_mtime) == time (NULL)) {
-    mtime -= 1;
-    utim.actime = mtime;
-    utim.modtime = mtime;
-    utime (f, &utim);
-  }
-
-  return mtime;
-}
-
 const char *mutt_make_version (int full)
 {
   static char vstring[STRING];
@@ -904,7 +872,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             /* read line */
             p_clear(&expn, 1);
             expn.data = mutt_read_line(NULL, &expn.dsize, fp, &line);
-            fclose(fp);
+            m_fclose(&fp);
             mutt_wait_filter(pid);
 
             /* if we got output, make a new string consiting of the shell ouptput