diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2011-02-08 12:13:53 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2011-02-08 12:13:53 +0000 |
| commit | 2640092f359175dac090ddbf1cdc482f216035eb (patch) | |
| tree | 8e9fa2e2c4ceae7b6bb5b92ded1f57c6a4099294 /security/clamav/files/patch-freshclam__manager.c | |
| parent | Fix build with gcc 4.2. (diff) | |
Update to 0.97
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268786
Diffstat (limited to 'security/clamav/files/patch-freshclam__manager.c')
| -rw-r--r-- | security/clamav/files/patch-freshclam__manager.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/security/clamav/files/patch-freshclam__manager.c b/security/clamav/files/patch-freshclam__manager.c deleted file mode 100644 index 38989c453a7a..000000000000 --- a/security/clamav/files/patch-freshclam__manager.c +++ /dev/null @@ -1,30 +0,0 @@ ---- freshclam/manager.c.orig 2010-11-23 12:41:18.000000000 +0100 -+++ freshclam/manager.c 2010-12-16 15:40:54.000000000 +0100 -@@ -1476,7 +1476,7 @@ - char lastline[256]; - int pipefd[2]; - pid_t pid; -- int status = 0; -+ int status = 0, ret; - FILE *f; - - if (pipe(pipefd) == -1) { -@@ -1513,7 +1513,8 @@ - } - fclose(f); - -- if (waitpid(pid, &status, 0) == -1 && errno != ECHILD) -+ while ((ret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); -+ if (ret == -1 && errno != ECHILD) - logg("^waitpid() failed: %s\n", strerror(errno)); - cli_chomp(firstline); - cli_chomp(lastline); -@@ -1523,7 +1524,7 @@ - lastline); - } - if (WIFEXITED(status)) { -- int ret = WEXITSTATUS(status); -+ ret = WEXITSTATUS(status); - if (ret) { - logg("^Database load exited with status %d\n", ret); - return ret; |