spip / SPIP

ecrire/inc/nfslock.php

Indentation +92 added lines, -92 removed lines

@@ -7,7 +7,7 @@ 
  **/
 
 if (!defined('_ECRIRE_INC_VERSION')) {
-	return;
+    return;
 }
 
 include_spip('inc/acces');
@@ -101,93 +101,93 @@ 
  * @return int|bool Timestamp du verrou, false si erreur
  */
 function spip_nfslock($fichier, $max_age = 0) {
-	$tries = 0;
+    $tries = 0;
 
-	if (!$max_age) {
-		$max_age = _DEFAULT_LOCKTIME;
-	}
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+    if (!$max_age) {
+        $max_age = _DEFAULT_LOCKTIME;
+    }
+    $lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
 
 
-	/*
+    /*
 	 * 1. create a tmp file with a psuedo random file name. we also make
 	 *    tpath which is a buffer to store the full pathname of the tmp file.
 	 */
 
-	$id = creer_uniqid();
-	$tpath = _DIR_TMP . "slock.$id";
-	$tmpfd = @fopen($tpath, 'w'); // hum, le 'x' necessite php4,3,2 ...
-	if (!$tmpfd) {  /* open failed */
-		@fclose($tmpfd);
-		spip_unlink($tpath);
+    $id = creer_uniqid();
+    $tpath = _DIR_TMP . "slock.$id";
+    $tmpfd = @fopen($tpath, 'w'); // hum, le 'x' necessite php4,3,2 ...
+    if (!$tmpfd) {  /* open failed */
+        @fclose($tmpfd);
+        spip_unlink($tpath);
 
-		return false; //NFSL_SYSF
-	}
+        return false; //NFSL_SYSF
+    }
 
-	/*
+    /*
 	 * 2. make fullpath, a buffer for the full pathname of the lock file.
 	 *    then start looping trying to lock it
 	 */
 
-	while ($tries < 10) {
-		/*
+    while ($tries < 10) {
+        /*
 		 * 3. link tmp file to lock file.  if it goes, we win and we clean
 		 *    up and return the st_ctime of the lock file.
 		 */
 
-		if (link($tpath, $lock_file) == 1) {
-			spip_unlink($tpath); /* got it! */
-			@fclose($tmpfd);
-			if (($our_tmp = lstat($lock_file)) == false) {  /* stat failed... shouldn't happen */
-				spip_unlink($lock_file);
+        if (link($tpath, $lock_file) == 1) {
+            spip_unlink($tpath); /* got it! */
+            @fclose($tmpfd);
+            if (($our_tmp = lstat($lock_file)) == false) {  /* stat failed... shouldn't happen */
+                spip_unlink($lock_file);
 
-				return false; // (NFSL_SYSF);
-			}
+                return false; // (NFSL_SYSF);
+            }
 
-			return ($our_tmp['ctime']);
-		}
+            return ($our_tmp['ctime']);
+        }
 
-		/*
+        /*
 		 * 4. the lock failed.  check for a stale lock file, being mindful
 		 *    of NFS and the fact the time is set from the NFS server.  we
 		 *    do a write on the tmp file to update its time to the server's
 		 *    idea of "now."
 		 */
 
-		$old_stat = lstat($lock_file);
-		if (@fputs($tmpfd, 'zz', 2) != 2 || !$our_tmp = fstat($tmpfd)) {
-			break;
-		} /* something bogus is going on */
+        $old_stat = lstat($lock_file);
+        if (@fputs($tmpfd, 'zz', 2) != 2 || !$our_tmp = fstat($tmpfd)) {
+            break;
+        } /* something bogus is going on */
 
 
-		if ($old_stat != false && (($old_stat['ctime'] + $max_age) < $our_tmp['ctime'])) {
-			spip_unlink($lock_file); /* break the stale lock */
-			$tries++;
-			/* It is CRITICAL that we sleep after breaking
+        if ($old_stat != false && (($old_stat['ctime'] + $max_age) < $our_tmp['ctime'])) {
+            spip_unlink($lock_file); /* break the stale lock */
+            $tries++;
+            /* It is CRITICAL that we sleep after breaking
 			 * the lock. Otherwise, we could race with
 			 * another process and unlink it's newly-
 			 * created file.
 			 */
-			sleep(1 + rand(0, 4));
-			continue;
-		}
+            sleep(1 + rand(0, 4));
+            continue;
+        }
 
-		/*
+        /*
 		 * 5. try again
 		 */
 
-		$tries++;
-		sleep(1 + rand(0, 4));
-	}
+        $tries++;
+        sleep(1 + rand(0, 4));
+    }
 
-	/*
+    /*
 	 * 6. give up, failure.
 	 */
 
-	spip_unlink($tpath);
-	@fclose($tmpfd);
+    spip_unlink($tpath);
+    @fclose($tmpfd);
 
-	return false; //(NFSL_LOCKED);
+    return false; //(NFSL_LOCKED);
 }
 
 /**
@@ -231,75 +231,75 @@ 
  * return bool true si déverrouillé, false sinon
  */
 function spip_nfsunlock($fichier, $birth, $max_age = 0, $test = false) {
-	$id = creer_uniqid();
-	if (!$max_age) {
-		$max_age = _DEFAULT_LOCKTIME;
-	}
+    $id = creer_uniqid();
+    if (!$max_age) {
+        $max_age = _DEFAULT_LOCKTIME;
+    }
 
-	/*
+    /*
 	 * 1. Build a temp file and stat that to get an idea of what the server
 	 *    thinks the current time is (our_tmp.st_ctime)..
 	 */
 
-	$tpath = _DIR_TMP . "stime.$id";
-	$tmpfd = @fopen($tpath, 'w');
-	if (
-		(!$tmpfd)
-		or (@fputs($tmpfd, 'zz', 2) != 2)
-		or !($our_tmp = fstat($tmpfd))
-	) {
-		/* The open failed, or we can't write the file, or we can't stat it */
-		@fclose($tmpfd);
-		spip_unlink($tpath);
+    $tpath = _DIR_TMP . "stime.$id";
+    $tmpfd = @fopen($tpath, 'w');
+    if (
+        (!$tmpfd)
+        or (@fputs($tmpfd, 'zz', 2) != 2)
+        or !($our_tmp = fstat($tmpfd))
+    ) {
+        /* The open failed, or we can't write the file, or we can't stat it */
+        @fclose($tmpfd);
+        spip_unlink($tpath);
 
-		return false; //(NFSL_SYSF);
-	}
+        return false; //(NFSL_SYSF);
+    }
 
-	@fclose($tmpfd);    /* We don't need this once we have our_tmp.st_ctime. */
-	spip_unlink($tpath);
+    @fclose($tmpfd);    /* We don't need this once we have our_tmp.st_ctime. */
+    spip_unlink($tpath);
 
-	/*
+    /*
 	 * 2. make fullpath, a buffer for the full pathname of the lock file
 	 */
 
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+    $lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
 
-	/*
+    /*
 	 * 3. If the ctime hasn't been modified, unlink the file and return. If the
 	 *    lock has expired, sleep the usual random interval before returning.
 	 *    If we didn't sleep, there could be a race if the caller immediately
 	 *    tries to relock the file.
 	 */
 
-	if (
-		($old_stat = @lstat($lock_file))  /* stat succeeds so file is there */
-		&& ($old_stat['ctime'] == $birth)
-	) {  /* hasn't been modified since birth */
-		if (!$test) {
-			spip_unlink($lock_file);
-		}      /* so the lock is ours to remove */
-		if ($our_tmp['ctime'] >= $birth + $max_age) {  /* the lock has expired */
-			if (!$test) {
-				return false;
-			} //(NFSL_LOST);
-			sleep(1 + (rand(0, 4)));    /* so sleep a bit */
-		}
-
-		return true;//(NFSL_OK);			/* success */
-	}
-
-	/*
+    if (
+        ($old_stat = @lstat($lock_file))  /* stat succeeds so file is there */
+        && ($old_stat['ctime'] == $birth)
+    ) {  /* hasn't been modified since birth */
+        if (!$test) {
+            spip_unlink($lock_file);
+        }      /* so the lock is ours to remove */
+        if ($our_tmp['ctime'] >= $birth + $max_age) {  /* the lock has expired */
+            if (!$test) {
+                return false;
+            } //(NFSL_LOST);
+            sleep(1 + (rand(0, 4)));    /* so sleep a bit */
+        }
+
+        return true;//(NFSL_OK);			/* success */
+    }
+
+    /*
 	 * 4. Either ctime has been modified, or the entire lock file is missing.
 	 *    If the lock should still be ours, based on the ctime of the temp
 	 *    file, return with NFSL_STOLEN. If not, then our lock is expired and
 	 *    someone else has grabbed the file, so return NFSL_LOST.
 	 */
 
-	if ($our_tmp['ctime'] < $birth + $max_age) { /* lock was stolen */
-		return false;
-	} //(NFSL_STOLEN);
+    if ($our_tmp['ctime'] < $birth + $max_age) { /* lock was stolen */
+        return false;
+    } //(NFSL_STOLEN);
 
-	return false; //(NFSL_LOST);	/* The lock must have expired first. */
+    return false; //(NFSL_LOST);	/* The lock must have expired first. */
 }
 
 
@@ -323,5 +323,5 @@ 
  * return bool true si déverrouillé, false sinon
  */
 function spip_nfslock_test($fichier, $birth, $max_age = 0) {
-	return spip_nfsunlock($fichier, $birth, $max_age, true);
+    return spip_nfsunlock($fichier, $birth, $max_age, true);
 }

Spacing +7 added lines, -7 removed lines

@@ -106,7 +106,7 @@ 
 	if (!$max_age) {
 		$max_age = _DEFAULT_LOCKTIME;
 	}
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+	$lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
 
 
 	/*
@@ -115,7 +115,7 @@ 
 	 */
 
 	$id = creer_uniqid();
-	$tpath = _DIR_TMP . "slock.$id";
+	$tpath = _DIR_TMP."slock.$id";
 	$tmpfd = @fopen($tpath, 'w'); // hum, le 'x' necessite php4,3,2 ...
 	if (!$tmpfd) {  /* open failed */
 		@fclose($tmpfd);
@@ -241,7 +241,7 @@ 
 	 *    thinks the current time is (our_tmp.st_ctime)..
 	 */
 
-	$tpath = _DIR_TMP . "stime.$id";
+	$tpath = _DIR_TMP."stime.$id";
 	$tmpfd = @fopen($tpath, 'w');
 	if (
 		(!$tmpfd)
@@ -255,14 +255,14 @@ 
 		return false; //(NFSL_SYSF);
 	}
 
-	@fclose($tmpfd);    /* We don't need this once we have our_tmp.st_ctime. */
+	@fclose($tmpfd); /* We don't need this once we have our_tmp.st_ctime. */
 	spip_unlink($tpath);
 
 	/*
 	 * 2. make fullpath, a buffer for the full pathname of the lock file
 	 */
 
-	$lock_file = _DIR_TMP . _NAME_LOCK . '-' . substr(md5($fichier), 0, 8);
+	$lock_file = _DIR_TMP._NAME_LOCK.'-'.substr(md5($fichier), 0, 8);
 
 	/*
 	 * 3. If the ctime hasn't been modified, unlink the file and return. If the
@@ -282,10 +282,10 @@ 
 			if (!$test) {
 				return false;
 			} //(NFSL_LOST);
-			sleep(1 + (rand(0, 4)));    /* so sleep a bit */
+			sleep(1 + (rand(0, 4))); /* so sleep a bit */
 		}
 
-		return true;//(NFSL_OK);			/* success */
+		return true; //(NFSL_OK);			/* success */
 	}
 
 	/*