diff --git a/src/config.h b/src/config.h index 2e3f75cb..5e79f1eb 100644 --- a/src/config.h +++ b/src/config.h @@ -14,7 +14,7 @@ #define VERSION "1.2.0" -#define BUILD 908 +#define BUILD 909 #define HOSTID "mailarchiver" diff --git a/src/extract.c b/src/extract.c index f1b75e80..14a19790 100644 --- a/src/extract.c +++ b/src/extract.c @@ -208,31 +208,6 @@ int extract_tnef(struct session_data *sdata, struct _state *state, char *filenam #endif -void read_content_with_popen(struct session_data *sdata, struct _state *state, char *cmd, struct __config *cfg){ - int len; - char buf[MAXBUFSIZE]; - FILE *f; - - if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_INFO, "running command: '%s'", cmd); - - f = popen(cmd, "r"); - if(f){ - while(fgets(buf, sizeof(buf)-1, f)){ - len = strlen(buf); - - if(state->bodylen < BIGBUFSIZE-len-1){ - memcpy(&(state->b_body[state->bodylen]), buf, len); - state->bodylen += len; - } - else break; - } - - fclose(f); - } - else syslog(LOG_PRIORITY, "%s: popen(): %s", sdata->ttmpfile, buf); - -} - void kill_helper(){ syslog(LOG_PRIORITY, "error: helper is killed by alarm");