#include "str.h"
#include "file.h"
-#include "../lib/debug.h"
-#include "../lib/str.h"
-
#ifndef O_NOFOLLOW
# define O_NOFOLLOW 0
#endif
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;
}
return -1;
len = m_strcat(abs_oldpath, sizeof(abs_oldpath), "/");
- if (len >= sizeof(abs_oldpath))
+ if (len >= ssizeof(abs_oldpath))
return -1;
len += m_strcpy(abs_oldpath + len, sizeof(abs_oldpath) - len, oldpath);
- if (len >= sizeof(abs_oldpath))
+ if (len >= ssizeof(abs_oldpath))
return -1;
if (symlink (abs_oldpath, newpath) < 0)
char buf[BUFSIZ];
unlink(s);
- p_clear(buf, sizeof(buf));
+ p_clear(buf, countof(buf));
while (sb.st_size > 0) {
- fwrite(buf, 1, MIN(sizeof(buf), sb.st_size), f);
- sb.st_size -= MIN(sizeof(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);
}
* 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) {
int mutt_copy_stream(FILE *fin, FILE *fout)
{
char buf[BUFSIZ];
- ssize_t l;
+ 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;
}
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) {
- ssize_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;
char *
mutt_concat_path(char *d, ssize_t n, const char *dir, const char *fname)
{
- const char *fmt = "%s/%s";
+ int pos;
+
+ pos = m_strcpy(d, n, dir);
+ if (pos >= n - 1)
+ return d;
- if (!*fname || (*dir && dir[m_strlen(dir) - 1] == '/'))
- fmt = "%s%s";
+ if (pos && d[pos - 1] != '/')
+ d[pos++] = '/';
- snprintf(d, n, fmt, dir, fname);
+ m_strcpy(d + pos, n - pos, fname);
return d;
}
/* FIXME: API is very wrong */
ssize_t mutt_quote_filename(char *d, ssize_t l, const char *s)
{
- size_t i, j = 0;
+ ssize_t i, j = 0;
if (!s) {
*d = '\0';