X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..21cafc50cc4d10b42f6e81963171ab0cdacec2f6:/connection.c

diff --git a/connection.c b/connection.c
index 67472baa..beb1dec6 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 2 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
@@ -13,36 +14,32 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #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)
-		return 1;
+	if (max_connections > 0) {
+		if ((fd = open(fname, O_RDWR|O_CREAT, 0600)) < 0)
+			return 0;
 
-	fd = open(fname,O_RDWR|O_CREAT, 0600);
+		/* Find a free spot. */
+		for (i = 0; i < max_connections; i++) {
+			if (lock_range(fd, i*4, 4))
+				return 1;
+		}
 
-	if (fd == -1) {
-		return 0;
+		close(fd);
 	}
 
-	/* 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 */
+	/* A lock failure needs to return an errno of 0. */
 	errno = 0;
-
-	close(fd);
 	return 0;
 }