make Tag int, move it to imap.c
This commit is contained in:
parent
9e61cb1d69
commit
f80f91d98b
10
src/imap.c
10
src/imap.c
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* isync - IMAP4 to maildir mailbox synchronizer
|
* isync - IMAP4 to maildir mailbox synchronizer
|
||||||
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
||||||
* Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@users.sf.net>
|
* Copyright (C) 2002-2004 Oswald Buddenhagen <ossi@users.sf.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -42,6 +42,8 @@
|
||||||
# include <openssl/err.h>
|
# include <openssl/err.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static int Tag;
|
||||||
|
|
||||||
const char *Flags[] = {
|
const char *Flags[] = {
|
||||||
"\\Seen",
|
"\\Seen",
|
||||||
"\\Answered",
|
"\\Answered",
|
||||||
|
@ -578,7 +580,7 @@ imap_exec (imap_t * imap, const char *fmt, ...)
|
||||||
imap->cram = 0;
|
imap->cram = 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if ((size_t) atol (arg) != Tag)
|
else if (atoi (arg) != Tag)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "IMAP error: wrong tag\n");
|
fprintf (stderr, "IMAP error: wrong tag\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1130,7 +1132,7 @@ imap_fetch_message (imap_t * imap, unsigned int uid, int fd)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
arg = next_arg (&cmd);
|
arg = next_arg (&cmd);
|
||||||
if (!arg || (size_t) atoi (arg) != Tag)
|
if (!arg || atoi (arg) != Tag)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "IMAP error: wrong tag\n");
|
fprintf (stderr, "IMAP error: wrong tag\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1300,7 +1302,7 @@ imap_append_message (imap_t * imap, int fd, message_t * msg)
|
||||||
{
|
{
|
||||||
/* XXX just ignore it for now */
|
/* XXX just ignore it for now */
|
||||||
}
|
}
|
||||||
else if (atoi (arg) != (int) Tag)
|
else if (atoi (arg) != Tag)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "IMAP error: wrong tag\n");
|
fprintf (stderr, "IMAP error: wrong tag\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* isync - IMAP4 to maildir mailbox synchronizer
|
* isync - IMAP4 to maildir mailbox synchronizer
|
||||||
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
||||||
* Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@users.sf.net>
|
* Copyright (C) 2002-2004 Oswald Buddenhagen <ossi@users.sf.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -178,7 +178,6 @@ imap_t;
|
||||||
|
|
||||||
extern config_t global;
|
extern config_t global;
|
||||||
extern config_t *boxes;
|
extern config_t *boxes;
|
||||||
extern unsigned int Tag;
|
|
||||||
extern char Hostname[256];
|
extern char Hostname[256];
|
||||||
extern int Verbose, Quiet;
|
extern int Verbose, Quiet;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
*
|
*
|
||||||
* isync - IMAP4 to maildir mailbox synchronizer
|
* isync - IMAP4 to maildir mailbox synchronizer
|
||||||
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
* Copyright (C) 2000-2002 Michael R. Elkins <me@mutt.org>
|
||||||
* Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@users.sf.net>
|
* Copyright (C) 2002-2004 Oswald Buddenhagen <ossi@users.sf.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -102,7 +102,6 @@ struct option Opts[] = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
config_t global;
|
config_t global;
|
||||||
unsigned int Tag = 0;
|
|
||||||
char Hostname[256];
|
char Hostname[256];
|
||||||
int Verbose = 0;
|
int Verbose = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user