--- rpl/src/semaphores.c	2012/07/03 13:56:32	1.47
+++ rpl/src/semaphores.c	2013/02/22 19:48:22	1.53
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.9
+  RPL/2 (R) version 4.1.12
   Copyright (C) 1989-2012 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -298,9 +298,10 @@ sem_init_SysV(sem_t *semaphore, int shar
 				return(-1);
 			}
 
-			sprintf((*semaphore).path, "%s/RPL-SEMAPHORE-%d-%llX-%d",
+			sprintf((*semaphore).path, "%s/RPL-SEMAPHORE-%d-%llX-%llX",
 					racine_segment, (int) getpid(),
-					(long long unsigned) pthread_self(), shared);
+					(long long unsigned) pthread_self(),
+					(long long unsigned) semaphore);
 
 			if ((desc = open((*semaphore).path, O_RDWR | O_CREAT | O_EXCL,
 					S_IRUSR | S_IWUSR)) == -1)
@@ -454,17 +455,23 @@ sem_wait_SysV(sem_t *semaphore)
 #	ifndef OS2 // IPCS_SYSV
 		struct sembuf		commande;
 
+		// semop() ne renvoie pas EINTR sur un signal !
+
 		commande.sem_num = 0;
 		commande.sem_op = -1;
 		commande.sem_flg = 0;
 
-		while(semop((*semaphore).sem, &commande, 1) == -1)
+		if (semop((*semaphore).sem, &commande, 1) == -1)
 		{
-			if (errno != EINTR)
+			if (errno != EAGAIN)
 			{
 				errno = EINVAL;
 				return(-1);
 			}
+			else
+			{
+				return(-1);
+			}
 		}
 
 		return(0);
@@ -512,13 +519,9 @@ sem_trywait_SysV(sem_t *semaphore)
 		commande.sem_op = -1;
 		commande.sem_flg = IPC_NOWAIT;
 
-		while(semop((*semaphore).sem, &commande, 1) == -1)
+		if (semop((*semaphore).sem, &commande, 1) == -1)
 		{
-			if (errno != EINTR)
-			{
-				errno = EINVAL;
-				return(-1);
-			}
+			return(-1);
 		}
 
 		return(0);