aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-20 23:21:50 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-20 23:21:50 -0700
commit4ae22d96fe9248dac4f26b1fc91154ba5e879799 (patch)
tree8db8bfa6d55d8120ca96f8311172830e814459c4
parent54e31a205c63d8bc8cd3dcf6956f81d3b968ea48 (diff)
parenta935c3972749095e7ea6c341e539a94de705ecfd (diff)
downloadgit-4ae22d96fe9248dac4f26b1fc91154ba5e879799.tar.gz
git-4ae22d96fe9248dac4f26b1fc91154ba5e879799.tar.xz
Merge branch 'fixes'
-rw-r--r--daemon.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon.c b/daemon.c
index 2b56d7d22..0c6182fb9 100644
--- a/daemon.c
+++ b/daemon.c
@@ -145,11 +145,11 @@ static int set_dir(const char *dir)
if ( chdir(dir) )
return -1;
-
+
/*
* Security on the cheap.
*
- * We want a readable HEAD, usable "objects" directory, and
+ * We want a readable HEAD, usable "objects" directory, and
* a "git-daemon-export-ok" flag that says that the other side
* is ok with us doing this.
*/
@@ -529,7 +529,7 @@ static int service_loop(int socknum, int *socklist)
}
signal(SIGCHLD, child_handler);
-
+
for (;;) {
int i;
@@ -566,13 +566,13 @@ static int service_loop(int socknum, int *socklist)
static int serve(int port)
{
int socknum, *socklist;
-
+
socknum = socksetup(port, &socklist);
if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port);
-
+
return service_loop(socknum, socklist);
-}
+}
int main(int argc, char **argv)
{