X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4fd842f98df4970f6e49a0365dbed60774e56c09..68ddbaf6457ebaa218587d1a4f9eb90f521174fc:/connection.c

diff --git a/connection.c b/connection.c
index d26a70aa..62818610 100644
--- a/connection.c
+++ b/connection.c
@@ -4,8 +4,9 @@
  * Copyright (C) 1998 Andrew Tridgell
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,30 +19,28 @@
 
 #include "rsync.h"
 
-/****************************************************************************
-simple routine to do connection counting
-****************************************************************************/
-int claim_connection(char *fname,int max_connections)
+/* A simple routine to do connection counting.  This returns 1 on success
+ * and 0 on failure, with errno also being set if the open() failed (errno
+ * will be 0 if the lock request failed). */
+int claim_connection(char *fname, int max_connections)
 {
 	int fd, i;
 
-	if (max_connections <= 0)
+	if (max_connections == 0)
 		return 1;
 
-	fd = open(fname,O_RDWR|O_CREAT, 0600);
-
-	if (fd == -1) {
+	if ((fd = open(fname, O_RDWR|O_CREAT, 0600)) < 0)
 		return 0;
-	}
 
-	/* find a free spot */
-	for (i=0;i<max_connections;i++) {
-		if (lock_range(fd, i*4, 4)) return 1;
+	/* Find a free spot. */
+	for (i = 0; i < max_connections; i++) {
+		if (lock_range(fd, i*4, 4))
+			return 1;
 	}
 
-	/* only interested in open failures */
-	errno = 0;
-
 	close(fd);
+
+	/* A lock failure needs to return an errno of 0. */
+	errno = 0;
 	return 0;
 }