diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 1999-12-26 22:53:25 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 1999-12-26 22:53:25 +0000 |
| commit | 4c5f1ccc3f27ce8ea51e9e0a0387a82e131a78ba (patch) | |
| tree | 59e8377d153968bf68ef5dcbfd79b77fb3646b57 | |
| parent | 31fbe7cac1c4d1ed16f9fd51ee48419c61f9e4ad (diff) | |
| download | fetchmail-4c5f1ccc3f27ce8ea51e9e0a0387a82e131a78ba.tar.gz fetchmail-4c5f1ccc3f27ce8ea51e9e0a0387a82e131a78ba.tar.bz2 fetchmail-4c5f1ccc3f27ce8ea51e9e0a0387a82e131a78ba.zip | |
Minor optimizations from Federico.
svn path=/trunk/; revision=2689
| -rw-r--r-- | env.c | 2 | ||||
| -rw-r--r-- | fetchmail.c | 9 | ||||
| -rw-r--r-- | unmime.c | 6 |
3 files changed, 9 insertions, 8 deletions
@@ -81,7 +81,7 @@ void envquery(int argc, char **argv) program_name = argv[0]; #define RCFILE_NAME ".fetchmailrc" - rcfile = (char *) xmalloc(strlen(home)+strlen(RCFILE_NAME)+2); + rcfile = (char *) xmalloc(strlen(home)+sizeof(RCFILE_NAME)+1); /* avoid //.fetchmailrc */ if (strcmp(home, "/") != 0) { strcpy(rcfile, home); diff --git a/fetchmail.c b/fetchmail.c index fc8490fb..6015411d 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -34,6 +34,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif /* HAVE_SYS_WAIT_H */ +#include <sys/utsname.h> #ifdef HAVE_GETHOSTBYNAME #include <netdb.h> @@ -183,7 +184,7 @@ int main(int argc, char **argv) #endif #define IDFILE_NAME ".fetchids" - run.idfile = (char *) xmalloc(strlen(home)+strlen(IDFILE_NAME)+2); + run.idfile = (char *) xmalloc(strlen(home)+sizeof(IDFILE_NAME)+1); strcpy(run.idfile, home); strcat(run.idfile, "/"); strcat(run.idfile, IDFILE_NAME); @@ -267,10 +268,10 @@ int main(int argc, char **argv) #define FETCHMAIL_PIDFILE "fetchmail.pid" if (!getuid()) { xalloca(tmpbuf, char *, - strlen(PID_DIR) + strlen(FETCHMAIL_PIDFILE) + 2); + sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE)); sprintf(tmpbuf, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE); } else { - xalloca(tmpbuf, char *, strlen(home) + strlen(FETCHMAIL_PIDFILE) + 3); + xalloca(tmpbuf, char *, strlen(home) + sizeof(FETCHMAIL_PIDFILE) + 2); strcpy(tmpbuf, home); strcat(tmpbuf, "/."); strcat(tmpbuf, FETCHMAIL_PIDFILE); @@ -294,7 +295,7 @@ int main(int argc, char **argv) #define NETRC_FILE ".netrc" /* parse the ~/.netrc file (if present) for future password lookups. */ - xalloca(netrc_file, char *, strlen (home) + strlen(NETRC_FILE) + 2); + xalloca(netrc_file, char *, strlen (home) + sizeof(NETRC_FILE) + 1); strcpy (netrc_file, home); strcat (netrc_file, "/"); strcat (netrc_file, NETRC_FILE); @@ -211,7 +211,7 @@ void UnMimeHeader(unsigned char *hdr) * and prepare to process the new MIME charset/encoding * header. */ - p_in = p + strlen(MIMEHDR_INIT); + p_in = p + sizeof(MIMEHDR_INIT) - 1; state = S_SKIP_MIMEINIT; } } @@ -270,10 +270,10 @@ static void SetEncoding8bit(unsigned char *XferEncOfs) unsigned char *p; if (XferEncOfs != NULL) { - memcpy(XferEncOfs, ENC8BIT, strlen(ENC8BIT)); + memcpy(XferEncOfs, ENC8BIT, sizeof(ENC8BIT) - 1); /* If anything left, in this header, replace with whitespace */ - for (p=XferEncOfs+strlen(ENC8BIT); (*p >= ' '); p++) *p=' '; + for (p=XferEncOfs+sizeof(ENC8BIT)-1; (*p >= ' '); p++) *p=' '; } } |