projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutt_expand_file_fmt -> m_quotefile_fmt in file.c
[apps/madmutt.git]
/
lib-lib
/
file.c
diff --git
a/lib-lib/file.c
b/lib-lib/file.c
index
56bcf1f
..
aee3580
100644
(file)
--- a/
lib-lib/file.c
+++ b/
lib-lib/file.c
@@
-200,7
+200,7
@@
void mutt_unlink(const char *s)
fwrite(buf, 1, MIN(ssizeof(buf), sb.st_size), f);
sb.st_size -= MIN(ssizeof(buf), sb.st_size);
}
fwrite(buf, 1, MIN(ssizeof(buf), sb.st_size), f);
sb.st_size -= MIN(ssizeof(buf), sb.st_size);
}
-
fclose (
f);
+
m_fclose(&
f);
}
}
}
}
}
}
@@
-258,13
+258,13
@@
int mutt_rename_file(char *oldfile, char *newfile)
nfp = safe_fopen(newfile, "w");
if (!nfp) {
nfp = safe_fopen(newfile, "w");
if (!nfp) {
-
fclose (
ofp);
+
m_fclose(&
ofp);
return 3;
}
mutt_copy_stream(ofp, nfp);
return 3;
}
mutt_copy_stream(ofp, nfp);
-
fclose(
nfp);
-
fclose(
ofp);
+
m_fclose(&
nfp);
+
m_fclose(&
ofp);
mutt_unlink(oldfile);
return 0;
}
mutt_unlink(oldfile);
return 0;
}
@@
-455,6
+455,14
@@
ssize_t m_file_fmt(char *dst, ssize_t n, const char *fmt, const char *src)
return pos;
}
return pos;
}
+ssize_t
+m_quotefile_fmt(char *dst, ssize_t n, const char *fmt, const char *src)
+{
+ char tmp[LONG_STRING];
+ mutt_quote_filename(tmp, sizeof(tmp), src);
+ return m_file_fmt(dst, n, fmt, tmp);
+}
+
static ssize_t
m_tempftplize(char *dst, ssize_t dlen, const char *fmt, const char *s)
{
static ssize_t
m_tempftplize(char *dst, ssize_t dlen, const char *fmt, const char *s)
{