mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/die_errno'

Browse Source 
* tr/die_errno:
  Use die_errno() instead of die() when checking syscalls
  Convert existing die(..., strerror(errno)) to die_errno()
  die_errno(): double % in strerror() output just in case
  Introduce die_errno() that appends strerror(errno) to die()
This commit is contained in:
Junio C Hamano
2009-07-06 09:39:46 -07:00
parent 864cd94917 0721c314a5
commit dd787c19c4
60 changed files with 225 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon.c
View File

@ -902,7 +902,7 @@ static int service_loop(int socknum, int *socklist)
case ECONNABORTED:
continue;
default:
die("accept returned %s", strerror(errno));
die_errno("accept returned");
}
}
handle(incoming, (struct sockaddr *)&ss, sslen);
@ -918,7 +918,7 @@ static void sanitize_stdfds(void)
while (fd != -1 && fd < 2)
fd = dup(fd);
if (fd == -1)
die("open /dev/null or dup failed: %s", strerror(errno));
die_errno("open /dev/null or dup failed");
if (fd > 2)
close(fd);
}
@ -929,12 +929,12 @@ static void daemonize(void)
case 0:
break;
case -1:
die("fork failed: %s", strerror(errno));
die_errno("fork failed");
default:
exit(0);
}
if (setsid() == -1)
die("setsid failed: %s", strerror(errno));
die_errno("setsid failed");
close(0);
close(1);
close(2);
@ -945,9 +945,9 @@ static void store_pid(const char *path)
{
FILE *f = fopen(path, "w");
if (!f)
die("cannot open pid file %s: %s", path, strerror(errno));
die_errno("cannot open pid file '%s'", path);
if (fprintf(f, "%"PRIuMAX"\n", (uintmax_t) getpid()) < 0 || fclose(f) != 0)
die("failed to write pid file %s: %s", path, strerror(errno));
die_errno("failed to write pid file '%s'", path);
}
static int serve(char *listen_addr, int listen_port, struct passwd *pass, gid_t gid)
@ -1147,8 +1147,7 @@ int main(int argc, char **argv)
socklen_t slen = sizeof(ss);
if (!freopen("/dev/null", "w", stderr))
die("failed to redirect stderr to /dev/null: %s",
strerror(errno));
die_errno("failed to redirect stderr to /dev/null");
if (getpeername(0, peer, &slen))
peer = NULL;