return (ch == ctrl ('G') ? err : ret);
}
-int _mutt_get_field ( /* const */ char *field, char *buf, size_t buflen,
+int _mutt_get_field ( const char *field, char *buf, size_t buflen,
int complete, int multiple, char ***files, int *numfiles)
{
int ret;
CLEARLINE (LINES - 1);
}
-static void fix_end_of_file (const char *data)
-{
- FILE *fp;
- int c;
-
- if ((fp = safe_fopen (data, "a+")) == NULL)
- return;
- fseek (fp, -1, SEEK_END);
- if ((c = fgetc (fp)) != '\n')
- fputc ('\n', fp);
- safe_fclose (&fp);
-}
-
void mutt_edit_file (const char *editor, const char *data)
{
char cmd[LONG_STRING];
mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
if (mutt_system (cmd) == -1)
mutt_error (_("Error running \"%s\"!"), cmd);
- fix_end_of_file (data);
keypad (stdscr, TRUE);
clearok (stdscr, TRUE);
}
if (!NetInc)
mutt_message (progress->msg);
else {
- mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
- progress->size);
+ if (progress->size)
+ mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
+ progress->size);
progress->pos = 0;
}
}
if (!NetInc)
return;
- if (pos > progress->pos + (NetInc << 10)) {
+ if (pos >= progress->pos + (NetInc << 10)) {
progress->pos = pos;
pos = pos / (NetInc << 10) * (NetInc << 10);
mutt_pretty_size (posstr, sizeof (posstr), pos);
- mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+ if (progress->size)
+ mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+ else
+ mutt_message ("%s %s", progress->msg, posstr);
}
}
#endif