lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

once again: (slightly) better output.

Browse Source 
make maildir flag setting failure non-fatal. maildir sucks ...
This commit is contained in:
Oswald Buddenhagen 2004-02-01 16:27:28 +00:00
parent a52fd7dde0
commit e5894bdf04
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@ -118,7 +118,7 @@ usage (int code)
fputs ( fputs (
PACKAGE " " VERSION " IMAP4 to maildir synchronizer\n" PACKAGE " " VERSION " IMAP4 to maildir synchronizer\n"
"Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>\n" "Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>\n"
"Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@users.sf.net>\n" "Copyright (C) 2002-2004 Oswald Buddenhagen <ossi@users.sf.net>\n"
"usage:\n" "usage:\n"
" " PACKAGE " [ flags ] mailbox [mailbox ...]\n" " " PACKAGE " [ flags ] mailbox [mailbox ...]\n"
" " PACKAGE " [ flags ] -a\n" " " PACKAGE " [ flags ] -a\n"
@ -322,8 +322,8 @@ main (int argc, char **argv)
if (!argv[optind] && !all) if (!argv[optind] && !all)
{ {
fprintf (stderr, "No mailbox specified"); fprintf (stderr, "No mailbox specified. Try isync -h\n");
usage (1); return 1;
} }
gethostname (Hostname, sizeof (Hostname)); gethostname (Hostname, sizeof (Hostname));

13
src/sync.c
View File

@ -155,6 +155,8 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
fd = open (path, O_RDONLY); fd = open (path, O_RDONLY);
if (fd == -1) if (fd == -1)
{ {
/* This can happen if the message was simply deleted (ok)
or the flags changed (not ok - maildir sucks). */
fprintf (stderr, "Error, unable to open %s: %s (errno %d)\n", fprintf (stderr, "Error, unable to open %s: %s (errno %d)\n",
path, strerror (errno), errno); path, strerror (errno), errno);
continue; continue;
@ -247,8 +249,7 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
if (rename (path, newpath)) if (rename (path, newpath))
{ {
perror ("rename"); perror ("Warning: cannot set flags on message");
return -1;
} }
else else
{ {
@ -264,9 +265,6 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
if (upload) if (upload)
info (" %d messages.\n", upload); info (" %d messages.\n", upload);
info ("Fetching new messages...");
fflush (stdout);
if (max_msgs == 0) if (max_msgs == 0)
max_msgs = UINT_MAX; max_msgs = UINT_MAX;
else else
@ -351,6 +349,8 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
continue; continue;
/* give some visual feedback that something is happening */ /* give some visual feedback that something is happening */
if (!fetched)
info ("Fetching new messages");
infoc ('.'); infoc ('.');
fflush (stdout); fflush (stdout);
fetched++; fetched++;
@ -390,7 +390,8 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags,
} }
} }
info (" %d messages\n", fetched); if (fetched)
info (" %d messages\n", fetched);
if (maildir_update_maxuid (mbox)) if (maildir_update_maxuid (mbox))
return -1; return -1;