projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
curs_lib.c
diff --git
a/curs_lib.c
b/curs_lib.c
index
46f6d30
..
86c2c38
100644
(file)
--- a/
curs_lib.c
+++ b/
curs_lib.c
@@
-156,19
+156,6
@@
void mutt_clear_error (void)
CLEARLINE (LINES - 1);
}
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];
void mutt_edit_file (const char *editor, const char *data)
{
char cmd[LONG_STRING];
@@
-177,7
+164,6
@@
void mutt_edit_file (const char *editor, const char *data)
mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
if (mutt_system (cmd) == -1)
mutt_error (_("Error running \"%s\"!"), cmd);
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);
}
keypad (stdscr, TRUE);
clearok (stdscr, TRUE);
}
@@
-318,8
+304,9
@@
void mutt_progress_bar (progress_t* progress, long pos) {
if (!NetInc)
mutt_message (progress->msg);
else {
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;
}
}
progress->pos = 0;
}
}
@@
-331,7
+318,10
@@
void mutt_progress_bar (progress_t* progress, long pos) {
progress->pos = pos;
pos = pos / (NetInc << 10) * (NetInc << 10);
mutt_pretty_size (posstr, sizeof (posstr), pos);
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
}
}
#endif