--- rpl/src/semaphores.c	2011/09/20 07:16:40	1.33
+++ rpl/src/semaphores.c	2020/01/10 11:15:51	1.89
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.3
-  Copyright (C) 1989-2011 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.32
+  Copyright (C) 1989-2020 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -22,23 +22,38 @@
 
 #include "rpl-conv.h"
 
-#ifdef SEMAPHORES_NOMMES
 
 // Les fonctions suivantes ne sont utilisées que dans le cas d'un
 // système POSIX qui ne possède pas de sémaphores anonymes. MacOS X
 // est dans ce cas.
 
 static unsigned char *
-nom_segment_semaphore(pid_t pid)
+nom_segment_semaphore(pid_t pid, int ordre)
 {
 	unsigned char				*fichier;
 
-	if ((fichier = malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)
+	if ((fichier = sys_malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)
 	{
 		return(NULL);
 	}
 
-	sprintf(fichier, "/RPL-SIGSEMAPHORE-%d", (int) pid);
+	sprintf(fichier, "/RPL-%llu-%d", (unsigned long long) pid, ordre);
+	return(fichier);
+}
+
+
+static unsigned char *
+nom_segment_semaphore_thread(pid_t pid, pthread_t tid, int ordre)
+{
+	unsigned char				*fichier;
+
+	if ((fichier = sys_malloc((1 + 256 + 1) * sizeof(unsigned char))) == NULL)
+	{
+		return(NULL);
+	}
+
+	sprintf(fichier, "/RPL-%llu-%llu-%d", (unsigned long long) pid,
+			(unsigned long long) tid, ordre);
 	return(fichier);
 }
 
@@ -56,55 +71,124 @@ nom_segment_semaphore(pid_t pid)
 */
 
 sem_t *
-sem_init2(unsigned int valeur, pid_t pid)
+sem_init2(unsigned int valeur, pid_t pid, int ordre)
 {
 	sem_t						*semaphore;
 
 	unsigned char				*chemin;
-	unsigned int				i;
+	unsigned char				*langue;
 
-	if ((chemin = nom_segment_semaphore(pid)) == NULL)
+	if ((chemin = nom_segment_semaphore(pid, ordre)) == NULL)
 	{
 		return(SEM_FAILED);
 	}
 
-	semaphore = sem_open(chemin, O_CREAT, (S_IRUSR | S_IWUSR), valeur);
-	free(chemin);
+	if ((semaphore = sem_open(chemin, O_RDWR | O_CREAT | O_EXCL,
+			S_IRUSR | S_IWUSR, valeur)) == SEM_FAILED)
+	{
+		if (errno == EEXIST)
+		{
+			if ((langue = getenv("LANG")) != NULL)
+			{
+				if (strncmp(langue, "fr", 2) == 0)
+				{
+					uprintf("+++Attention : Le sémaphore %s préexiste !\n",
+							chemin);
+				}
+				else
+				{
+					uprintf("+++Warning: %s semaphore preexists!\n", chemin);
+				}
+			}
+			else
+			{
+				uprintf("+++Warning: %s semaphore preexists!\n", chemin);
+			}
+
+			if (sem_unlink(chemin) != 0)
+			{
+				sys_free(chemin);
+				return(SEM_FAILED);
+			}
 
-	for(i = 0; i < valeur; i++)
+			semaphore = sem_open(chemin, O_RDWR | O_CREAT | O_EXCL,
+					S_IRUSR | S_IWUSR, valeur);
+		}
+	}
+
+	sys_free(chemin);
+
+	return(semaphore);
+}
+
+
+sem_t *
+sem_init3(unsigned int valeur, pid_t pid, pthread_t tid, int ordre)
+{
+	sem_t						*semaphore;
+
+	unsigned char				*chemin;
+	unsigned char				*langue;
+
+	if ((chemin = nom_segment_semaphore_thread(pid, tid, ordre)) == NULL)
 	{
-		if (sem_post(semaphore) != 0)
+		return(SEM_FAILED);
+	}
+
+	if ((semaphore = sem_open(chemin, O_RDWR | O_CREAT | O_EXCL,
+			S_IRUSR | S_IWUSR, valeur)) == SEM_FAILED)
+	{
+		if (errno == EEXIST)
 		{
-			sem_close(semaphore);
-			return(SEM_FAILED);
+			if ((langue = getenv("LANG")) != NULL)
+			{
+				if (strncmp(langue, "fr", 2) == 0)
+				{
+					uprintf("+++Attention : Le sémaphore %s préexiste !\n",
+							chemin);
+				}
+				else
+				{
+					uprintf("+++Warning: %s semaphore preexists!\n", chemin);
+				}
+			}
+			else
+			{
+				uprintf("+++Warning: %s semaphore preexists!\n", chemin);
+			}
+
+			semaphore = sem_open(chemin, O_RDWR | O_CREAT,
+					S_IRUSR | S_IWUSR, valeur);
 		}
 	}
 
+	sys_free(chemin);
+
 	return(semaphore);
 }
 
 
 sem_t *
-sem_open2(pid_t pid)
+sem_open2(pid_t pid, int ordre)
 {
 	unsigned char				*chemin;
 
 	sem_t						*semaphore;
 
-	if ((chemin = nom_segment_semaphore(pid)) == NULL)
+	if ((chemin = nom_segment_semaphore(pid, ordre)) == NULL)
 	{
-		return(1);
+		return(SEM_FAILED);
 	}
 
 	semaphore = sem_open(chemin, O_RDWR);
-	free(chemin);
+	sys_free(chemin);
 
 	return(semaphore);
 }
 
 
 int
-sem_destroy2(sem_t *semaphore, pid_t pid)
+sem_destroy2(sem_t *semaphore, pid_t pid, int ordre)
 {
 	int							erreur;
 
@@ -112,20 +196,38 @@ sem_destroy2(sem_t *semaphore, pid_t pid
 
 	sem_close(semaphore);
 
-	if ((chemin = nom_segment_semaphore(pid)) == NULL)
+	if ((chemin = nom_segment_semaphore(pid, ordre)) == NULL)
 	{
 		return(1);
 	}
 
 	erreur = sem_unlink(chemin);
-	free(chemin);
+	sys_free(chemin);
+
+	return(erreur);
+}
+
+
+int
+sem_destroy3(sem_t *semaphore, pid_t pid, pthread_t tid, int ordre)
+{
+	int							erreur;
+
+	unsigned char				*chemin;
+
+	sem_close(semaphore);
+
+	if ((chemin = nom_segment_semaphore_thread(pid, tid, ordre)) == NULL)
+	{
+		return(1);
+	}
+
+	erreur = sem_unlink(chemin);
+	sys_free(chemin);
 
 	return(erreur);
 }
 
-#undef sem_post
-#undef sem_wait
-#undef sem_trywait
 
 int
 sem_getvalue2(sem_t *semaphore, int *valeur)
@@ -182,6 +284,7 @@ sem_getvalue2(sem_t *semaphore, int *val
 			return(0);
 		}
 
+		nanosleep(&attente, NULL);
 		INCR_GRANULARITE(attente.tv_nsec);
 	}
 
@@ -192,7 +295,11 @@ sem_getvalue2(sem_t *semaphore, int *val
 	return(0);
 }
 
-#endif
+
+#undef sem_post
+#undef sem_wait
+#undef sem_trywait
+
 
 #ifdef IPCS_SYSV
 
@@ -229,6 +336,8 @@ sem_init_SysV(sem_t *semaphore, int shar
 
 		union semun		argument;
 
+		unsigned char	*langue;
+
 		if (shared == 0)
 		{
 			// Sémaphore privé
@@ -236,34 +345,67 @@ sem_init_SysV(sem_t *semaphore, int shar
 					S_IRUSR | S_IWUSR);
 			(*semaphore).path = NULL;
 			(*semaphore).pid = getpid();
+			(*semaphore).tid = pthread_self();
 			(*semaphore).alloue = 0;
 		}
 		else
 		{
 			// Sémaphore partagé entre plusieurs processus
-			if (((*semaphore).path = malloc((strlen(racine_segment)
-					+ 1 + 32 + 1) * sizeof(unsigned char))) == NULL)
+			if (((*semaphore).path = sys_malloc((strlen(racine_segment)
+					+ 2 + 256 + 1) * sizeof(unsigned char))) == NULL)
 			{
 				return(-1);
 			}
 
-			sprintf((*semaphore).path, "%s/RPL-SIGSEMAPHORE-%d", racine_segment,
-					(int) getpid());
+			sprintf((*semaphore).path, "%s/RPL-SEMAPHORE-%d-%llX-%llX",
+					racine_segment, (int) getpid(),
+					(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)
 			{
-				free((*semaphore).path);
-				return(-1);
+				if (errno != EEXIST)
+				{
+					sys_free((*semaphore).path);
+					return(-1);
+				}
+
+				if ((langue = getenv("LANG")) != NULL)
+				{
+					if (strncmp(langue, "fr", 2) == 0)
+					{
+						uprintf("+++Attention : Le sémaphore %s préexiste !\n",
+								(*semaphore).path);
+					}
+					else
+					{
+						uprintf("+++Warning: %s semaphore preexists!\n",
+								(*semaphore).path);
+					}
+				}
+				else
+				{
+					uprintf("+++Warning: %s semaphore preexists!\n",
+							(*semaphore).path);
+				}
+
+				if ((desc = open((*semaphore).path, O_RDWR | O_CREAT,
+						S_IRUSR | S_IWUSR)) == -1)
+				{
+					sys_free((*semaphore).path);
+					return(-1);
+				}
 			}
 
 			(*semaphore).pid = getpid();
+			(*semaphore).tid = pthread_self();
 			clef = ftok((*semaphore).path, 1);
 			close(desc);
 
 			if (clef == -1)
 			{
-				free((*semaphore).path);
+				sys_free((*semaphore).path);
 				return(-1);
 			}
 
@@ -278,61 +420,54 @@ sem_init_SysV(sem_t *semaphore, int shar
 			return(-1);
 		}
 
-		argument.val = valeur;
+		argument.val = (int) valeur;
 		ios = semctl((*semaphore).sem, 0, SETVAL, argument);
 
 		return(ios);
 #	else // OS/2
+		sem_t			*psem;
 
-	sem_t			*psem;
-
-	psem = semaphore;
-
-	if (shared != 0)
-	{
-		errno = ENOSYS;
-		return(-1);
-	}
-
-	if (((*psem).cnt = malloc(sizeof(ULONG))) == NULL)
-	{
-		free(psem);
-		errno = ENOMEM;
-		return(-1);
-	}
+		psem = semaphore;
 
-	if (((*psem).nopened = malloc(sizeof(ULONG))) == NULL)
-	{
-		free((*psem).cnt);
-		free(psem);
-		errno = ENOMEM;
-		return(-1);
-	}
+		if (((*psem).cnt = sys_malloc(sizeof(ULONG))) == NULL)
+		{
+			sys_free(psem);
+			errno = ENOMEM;
+			return(-1);
+		}
 
-	if (DosCreateMutexSem(NULL, &((*psem).hmtx), 0, 0) != 0)
-	{
-		free((*psem).cnt);
-		free((*psem).nopened);
-		free(psem);
-		return(-1);
-	}
+		if (((*psem).nopened = sys_malloc(sizeof(ULONG))) == NULL)
+		{
+			sys_free((*psem).cnt);
+			sys_free(psem);
+			errno = ENOMEM;
+			return(-1);
+		}
 
-	if (DosCreateEventSem(NULL, &((*psem).hev), 0, (valeur != 0) ? 1 : 0) != 0)
-	{
-		DosCloseMutexSem((*psem).hmtx);
-		free((*psem).cnt);
-		free((*psem).nopened);
-		free(psem);
-		return(-1);
-	}
+		if (DosCreateMutexSem(NULL, &((*psem).hmtx), 0, 0) != 0)
+		{
+			sys_free((*psem).cnt);
+			sys_free((*psem).nopened);
+			sys_free(psem);
+			return(-1);
+		}
 
-	(*(*psem).cnt) = valeur;
-	(*(*psem).nopened) = 1;
-	(*psem).shared = shared;
-	(*psem).allocated = 0;
+		if (DosCreateEventSem(NULL, &((*psem).hev), 0, (valeur != 0) ? 1 : 0)
+				!= 0)
+		{
+			DosCloseMutexSem((*psem).hmtx);
+			sys_free((*psem).cnt);
+			sys_free((*psem).nopened);
+			sys_free(psem);
+			return(-1);
+		}
 
-	return(0);
+		(*(*psem).cnt) = valeur;
+		(*(*psem).nopened) = 1;
+		(*psem).shared = shared;
+		(*psem).allocated = 0;
 
+		return(0);
 #	endif
 }
 
@@ -359,48 +494,46 @@ sem_destroy_SysV(sem_t *semaphore)
 
 		return(0);
 #	else // OS/2
+		sem_t		*psem;
 
-	sem_t		*psem;
+		psem = semaphore;
 
-	psem = semaphore;
-
-	if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-	{
-		return(EINVAL);
-	}
+		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+		{
+			return(EINVAL);
+		}
 
-	if (DosCloseMutexSem((*psem).hmtx) != 0)
-	{
-		return(EINVAL);
-	}
+		if (DosCloseMutexSem((*psem).hmtx) != 0)
+		{
+			return(EINVAL);
+		}
 
-	while(DosCloseEventSem((*psem).hev) == ERROR_SEM_BUSY)
-	{
-		DosPostEventSem((*psem).hev);
-	}
+		while(DosCloseEventSem((*psem).hev) == ERROR_SEM_BUSY)
+		{
+			DosPostEventSem((*psem).hev);
+		}
 
-	(*(*psem).nopened)--;
+		(*(*psem).nopened)--;
 
-	if ((*psem).shared == 0)
-	{
-		free((*psem).cnt);
-		free((*psem).nopened);
-	}
-	else
-	{
-		if ((*(*psem).nopened) == 0)
+		if ((*psem).shared == 0)
 		{
-			DosFreeMem((*psem).cnt);
+			sys_free((*psem).cnt);
+			sys_free((*psem).nopened);
+		}
+		else
+		{
+			if ((*(*psem).nopened) == 0)
+			{
+				DosFreeMem((*psem).cnt);
+			}
 		}
-	}
-
-	if ((*psem).allocated != 0)
-	{	
-		free(psem);
-	}
 
-	return(0);
+		if ((*psem).allocated != 0)
+		{	
+			sys_free(psem);
+		}
 
+		return(0);
 #	endif
 }
 
@@ -410,53 +543,57 @@ 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);
 #	else // OS/2
+		sem_t		*psem;
 
-	sem_t		*psem;
+		ULONG		cnt;
 
-	ULONG		cnt;
+		psem = semaphore;
 
-	psem = semaphore;
-
-	if (DosWaitEventSem((*psem).hev, SEM_INDEFINITE_WAIT) != 0)
-	{
-		errno = EINVAL;
-		return(-1);
-	}
-
-	if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-	{
-		errno = EINVAL;
-		return(-1);
-	}
+		if (DosWaitEventSem((*psem).hev, SEM_INDEFINITE_WAIT) != 0)
+		{
+			errno = EINVAL;
+			return(-1);
+		}
 
-	if ((*(*psem).cnt) > 0)
-	{
-		(*(*psem).cnt)--;
-	}
+		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+		{
+			errno = EINVAL;
+			return(-1);
+		}
 
-	if ((*(*psem).cnt) == 0)
-	{
-		DosResetEventSem((*psem).hev, &cnt);
-	}
+		if ((*(*psem).cnt) > 0)
+		{
+			(*(*psem).cnt)--;
+		}
 
-	DosReleaseMutexSem((*psem).hmtx);
-	return(0);
+		if ((*(*psem).cnt) == 0)
+		{
+			DosResetEventSem((*psem).hev, &cnt);
+		}
 
+		DosReleaseMutexSem((*psem).hmtx);
+		return(0);
 #	endif
 }
 
@@ -470,52 +607,104 @@ 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);
 #	else // OS/2
+		int			ios;
 
-	int			ios;
+		sem_t		*psem;
 
-	sem_t		*psem;
+		ULONG		cnt;
 
-	ULONG		cnt;
+		psem = semaphore;
 
-	psem = semaphore;
+		if ((ios = DosWaitEventSem((*psem).hev, SEM_IMMEDIATE_RETURN)) != 0)
+		{
+			errno = (ios == ERROR_TIMEOUT) ? EAGAIN : EINVAL;
+			return(-1);
+		}
 
-	if ((ios = DosWaitEventSem((*psem).hev, SEM_IMMEDIATE_RETURN)) != 0)
-	{
-		errno = (ios == ERROR_TIMEOUT) ? EAGAIN : EINVAL;
-		return(-1);
-	}
+		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+		{
+			errno = EINVAL;
+			return(-1);
+		}
 
-	if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-	{
-		errno = EINVAL;
-		return(-1);
-	}
+		if ((*(*psem).cnt) > 0)
+		{
+			(*(*psem).cnt)--;
+		}
 
-	if ((*(*psem).cnt) > 0)
-	{
-		(*(*psem).cnt)--;
-	}
+		if ((*(*psem).cnt) == 0)
+		{
+			DosResetEventSem((*psem).hev, &cnt);
+		}
 
-	if ((*(*psem).cnt) == 0)
+		DosReleaseMutexSem((*psem).hmtx);
+		return(0);
+#	endif
+}
+
+#ifndef timespeccmp
+#	define timespeccmp(tsp, usp, cmp) \
+			(((tsp)->tv_sec == (usp)->tv_sec) ? \
+			((tsp)->tv_nsec cmp (usp)->tv_nsec) : \
+			((tsp)->tv_sec cmp (usp)->tv_sec))
+#	define timespecadd(tsp, usp, vsp) \
+			do { \
+				(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec; \
+				(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec; \
+				if ((vsp)->tv_nsec >= 1000000000L) { \
+					(vsp)->tv_sec++; \
+					(vsp)->tv_nsec -= 1000000000L; \
+				} \
+			} while(0)
+#	define timespecsub(tsp, usp, vsp) \
+			do { \
+				(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \
+				(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \
+				if ((vsp)->tv_nsec < 0) { \
+					(vsp)->tv_sec--; \
+					(vsp)->tv_nsec += 1000000000L; \
+				} \
+			} while(0)
+#endif
+
+int
+sem_timedwait_SysV(sem_t *sem, struct timespec *ts)
+{
+	struct timespec onems = { 0, 1000000 };
+	struct timespec total = { 0, 0 };
+	struct timespec unslept;
+	struct timespec elapsed;
+	struct timespec tmp;
+
+	while(timespeccmp(ts, &total, >))
 	{
-		DosResetEventSem((*psem).hev, &cnt);
-	}
+		if (sem_trywait_SysV(sem) == 0)
+		{
+			return(0);
+		}
 
-	DosReleaseMutexSem((*psem).hmtx);
-	return(0);
+		if (errno != EAGAIN)
+		{
+			return(-1);
+		}
 
-#	endif
+		nanosleep(&onems, &unslept);
+
+		timespecsub(&onems, &unslept, &elapsed);
+		timespecadd(&total, &elapsed, &tmp);
+		total.tv_sec = tmp.tv_sec;
+		total.tv_nsec = tmp.tv_nsec;
+	}
+
+	errno = ETIMEDOUT;
+	return(-1);
 }
 
 int
@@ -539,23 +728,21 @@ sem_post_SysV(sem_t *semaphore)
 
 		return(0);
 #	else // OS/2
+		sem_t				*psem;
 
-	sem_t				*psem;
-
-	psem = semaphore;
-
-	if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-	{
-		errno = EINVAL;
-		return(-1);
-	}
+		psem = semaphore;
 
-	(*(*psem).cnt)++;
-	DosPostEventSem((*psem).hev);
-	DosReleaseMutexSem((*psem).hmtx);
+		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+		{
+			errno = EINVAL;
+			return(-1);
+		}
 
-	return(0);
+		(*(*psem).cnt)++;
+		DosPostEventSem((*psem).hev);
+		DosReleaseMutexSem((*psem).hmtx);
 
+		return(0);
 #	endif
 }
 
@@ -572,22 +759,20 @@ sem_getvalue_SysV(sem_t *semaphore, int
 
 		return(0);
 #	else
+		sem_t				*psem;
 
-	sem_t				*psem;
-
-	psem = semaphore;
-
-	if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-	{
-		errno = EINVAL;
-		return(-1);
-	}
+		psem = semaphore;
 
-	(*valeur) = (*(*psem).cnt);
-	DosReleaseMutexSem((*psem).hmtx);
+		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+		{
+			errno = EINVAL;
+			return(-1);
+		}
 
-	return(0);
+		(*valeur) = (*(*psem).cnt);
+		DosReleaseMutexSem((*psem).hmtx);
 
+		return(0);
 #	endif
 }
 
@@ -606,6 +791,8 @@ sem_t
 		key_t			clef;
 
 		union semun		argument;
+
+		unsigned char	*langue;
 #	endif
 
 	unsigned char		*nom_absolu;
@@ -624,7 +811,7 @@ sem_t
 #	endif
 
 #	ifndef OS2 // IPCS_SYSV
-		if ((nom_absolu = malloc((strlen(racine_segment) + strlen(nom)
+		if ((nom_absolu = sys_malloc((strlen(racine_segment) + strlen(nom)
 				+ 2) * sizeof(unsigned char))) == NULL)
 		{
 			return(SEM_FAILED);
@@ -632,61 +819,61 @@ sem_t
 
 		sprintf(nom_absolu, "%s/%s", racine_segment, nom);
 
-		if ((semaphore = malloc(sizeof(sem_t))) == NULL)
+		if ((semaphore = sys_malloc(sizeof(sem_t))) == NULL)
 		{
 			return(SEM_FAILED);
 		}
 
 		(*semaphore).alloue = -1;
+		(*semaphore).pid = getpid();
+		(*semaphore).tid = pthread_self();
 #	else
-
-	if ((nom_segment = malloc((strlen(racine_memoire_OS2) + strlen(nom) + 1)
-			* sizeof(unsigned char))) == NULL)
-	{
-		return(SEM_FAILED);
-	}	
-
-	sprintf(nom_segment, "%s%s", racine_memoire_OS2, nom);
-	ptr = nom_segment;
-
-	while((*ptr) != d_code_fin_chaine)
-	{
-		if ((*ptr) == '/')
+		if ((nom_segment = sys_malloc((strlen(racine_memoire_OS2) + strlen(nom)
+				+ 1) * sizeof(unsigned char))) == NULL)
 		{
-			(*ptr) = '\\';
-		}
+			return(SEM_FAILED);
+		}	
 
-		ptr++;
-	}
+		sprintf(nom_segment, "%s%s", racine_memoire_OS2, nom);
+		ptr = nom_segment;
 
-	if ((nom_absolu = malloc((strlen(racine_semaphores_OS2) + strlen(nom)
-			+ 2) * sizeof(unsigned char))) == NULL)
-	{
-		return(SEM_FAILED);
-	}
+		while((*ptr) != d_code_fin_chaine)
+		{
+			if ((*ptr) == '/')
+			{
+				(*ptr) = '\\';
+			}
 
-	sprintf(nom_absolu, "%s%s", racine_semaphores_OS2, nom);
-	ptr = nom_absolu;
+			ptr++;
+		}
 
-	while((*ptr) != d_code_fin_chaine)
-	{
-		if ((*ptr) == '/')
+		if ((nom_absolu = sys_malloc((strlen(racine_semaphores_OS2) +
+				strlen(nom) + 2) * sizeof(unsigned char))) == NULL)
 		{
-			(*ptr) = '\\';
+			return(SEM_FAILED);
 		}
 
-		ptr++;
-	}
+		sprintf(nom_absolu, "%s%s", racine_semaphores_OS2, nom);
+		ptr = nom_absolu;
 
-	(*(ptr + 1)) = d_code_fin_chaine;
+		while((*ptr) != d_code_fin_chaine)
+		{
+			if ((*ptr) == '/')
+			{
+				(*ptr) = '\\';
+			}
 
-	if ((psem = malloc(sizeof(sem_t))) == NULL)
-	{
-		return(SEM_FAILED);
-	}
+			ptr++;
+		}
+
+		(*(ptr + 1)) = d_code_fin_chaine;
 
-	(*psem).allocated = 1;
+		if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
+		{
+			return(SEM_FAILED);
+		}
 
+		(*psem).allocated = 1;
 #	endif
 
 	if ((oflag & O_CREAT) == 0)
@@ -707,77 +894,77 @@ sem_t
 
 			if ((*semaphore).sem == -1)
 			{	
-				free(semaphore);
-				free(nom_absolu);
+				sys_free(semaphore);
+				sys_free(nom_absolu);
 
 				return(SEM_FAILED);
 			}
 #		else // OS/2
-		if ((psem = malloc(sizeof(sem_t))) == NULL)
-		{
-			free(nom_absolu);
-			free(nom_segment);
-			return(SEM_FAILED);
-		}
-
-		(*ptr) = 'M';
+			if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
+			{
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
+				return(SEM_FAILED);
+			}
 
-		if (DosOpenMutexSem(nom_absolu, &((*psem).hmtx)) != 0)
-		{
-			free(psem);
-			free(nom_absolu);
-			free(nom_segment);
+			(*ptr) = 'M';
 
-			return(SEM_FAILED);
-		}
+			if (DosOpenMutexSem(nom_absolu, &((*psem).hmtx)) != 0)
+			{
+				sys_free(psem);
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
 
-		(*ptr) = 'S';
+				return(SEM_FAILED);
+			}
 
-		if (DosOpenEventSem(nom_absolu, &((*psem).hev)) != 0)
-		{
-			DosCloseMutexSem((*psem).hmtx);
+			(*ptr) = 'S';
 
-			free(psem);
-			free(nom_absolu);
-			free(nom_segment);
+			if (DosOpenEventSem(nom_absolu, &((*psem).hev)) != 0)
+			{
+				DosCloseMutexSem((*psem).hmtx);
 
-			return(SEM_FAILED);
-		}
+				sys_free(psem);
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
 
-		if (DosGetNamedSharedMem(&base, nom_segment, PAG_WRITE | PAG_READ) != 0)
-		{
-			DosCloseMutexSem((*psem).hmtx);
+				return(SEM_FAILED);
+			}
 
-			free(nom_absolu);
-			free(nom_segment);
-			free(psem);
+			if (DosGetNamedSharedMem(&base, nom_segment, PAG_WRITE | PAG_READ)
+					!= 0)
+			{
+				DosCloseMutexSem((*psem).hmtx);
 
-			return(SEM_FAILED);
-		}
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
+				sys_free(psem);
 
-		free(nom_segment);
+				return(SEM_FAILED);
+			}
 
-		(*psem).cnt = (ULONG *) base;
-		(*psem).nopened = ((ULONG *) base) + 1;
-		(*psem).shared = 1;
+			sys_free(nom_segment);
 
-		if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
-		{
-			DosCloseMutexSem((*psem).hmtx);
+			(*psem).cnt = (ULONG *) base;
+			(*psem).nopened = ((ULONG *) base) + 1;
+			(*psem).shared = 1;
 
-			free(nom_absolu);
-			free(nom_segment);
-			free(psem);
+			if (DosRequestMutexSem((*psem).hmtx, SEM_INDEFINITE_WAIT) != 0)
+			{
+				DosCloseMutexSem((*psem).hmtx);
 
-			return(SEM_FAILED);
-		}
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
+				sys_free(psem);
 
-		(*((*psem).nopened))++;
+				return(SEM_FAILED);
+			}
 
-		DosReleaseMutexSem((*psem).hmtx);
+			(*((*psem).nopened))++;
 
-		semaphore = psem;
+			DosReleaseMutexSem((*psem).hmtx);
 
+			semaphore = psem;
 #		endif
 	}
 	else
@@ -796,17 +983,46 @@ sem_t
 			if ((desc = open(nom_absolu, O_CREAT | O_EXCL | O_RDWR,
 					S_IRUSR | S_IWUSR)) == -1)
 			{
-				free(semaphore);
-				free(nom_absolu);
+				if (errno != EEXIST)
+				{
+					sys_free(semaphore);
+					sys_free(nom_absolu);
+					return(SEM_FAILED);
+				}
 
-				return(SEM_FAILED);
+				if ((langue = getenv("LANG")) != NULL)
+				{
+					if (strncmp(langue, "fr", 2) == 0)
+					{
+						uprintf("+++Attention : Le sémaphore %s préexiste !\n",
+								nom_absolu);
+					}
+					else
+					{
+						uprintf("+++Warning: %s semaphore preexists!\n",
+								nom_absolu);
+					}
+				}
+				else
+				{
+					uprintf("+++Warning: %s semaphore preexists!\n",
+							nom_absolu);
+				}
+
+				if ((desc = open(nom_absolu, O_CREAT | O_RDWR,
+						S_IRUSR | S_IWUSR)) == -1)
+				{
+					sys_free(semaphore);
+					sys_free(nom_absolu);
+					return(SEM_FAILED);
+				}
 			}
 
 			if ((clef = ftok(nom_absolu, 1)) == -1)
 			{
 				close(desc);
-				free(semaphore);
-				free(nom_absolu);
+				sys_free(semaphore);
+				sys_free(nom_absolu);
 
 				return(SEM_FAILED);
 			}
@@ -822,70 +1038,68 @@ sem_t
 
 			if ((*semaphore).sem == -1)
 			{	
-				free(semaphore);
-				free(nom_absolu);
+				sys_free(semaphore);
+				sys_free(nom_absolu);
 
 				return(SEM_FAILED);
 			}
 
-			argument.val = valeur;
+			argument.val = (int) valeur;
 			semctl((*semaphore).sem, 0, SETVAL, argument);
 #		else // OS/2
+			if ((psem = sys_malloc(sizeof(sem_t))) == NULL)
+			{
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
 
-		if ((psem = malloc(sizeof(sem_t))) == NULL)
-		{
-			free(nom_absolu);
-			free(nom_segment);
-
-			return(SEM_FAILED);
-		}
-
-		(*ptr) = 'M';
+				return(SEM_FAILED);
+			}
 
-		if (DosCreateMutexSem(nom_absolu, &((*psem).hmtx), 0, 0) != 0)
-		{
-			free(psem);
-			free(nom_absolu);
-			free(nom_segment);
+			(*ptr) = 'M';
 
-			return(SEM_FAILED);
-		}
+			if (DosCreateMutexSem(nom_absolu, &((*psem).hmtx), 0, 0) != 0)
+			{
+				sys_free(psem);
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
 
-		(*ptr) = 'S';
+				return(SEM_FAILED);
+			}
 
-		if (DosCreateEventSem(nom_absolu, &((*psem).hev), 0,
-				(valeur != 0) ? 1 : 0) != 0)
-		{
-			DosCloseMutexSem((*psem).hmtx);
+			(*ptr) = 'S';
 
-			free(nom_absolu);
-			free(nom_segment);
-			free(psem);
+			if (DosCreateEventSem(nom_absolu, &((*psem).hev), 0,
+					(valeur != 0) ? 1 : 0) != 0)
+			{
+				DosCloseMutexSem((*psem).hmtx);
 
-			return(SEM_FAILED);
-		}
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
+				sys_free(psem);
 
-		if (DosAllocSharedMem(&base, nom_segment, 2 * sizeof(ULONG),
-				PAG_WRITE | PAG_READ | PAG_COMMIT) != 0)
-		{
-			DosCloseMutexSem((*psem).hmtx);
+				return(SEM_FAILED);
+			}
 
-			free(nom_absolu);
-			free(nom_segment);
-			free(psem);
+			if (DosAllocSharedMem(&base, nom_segment, 2 * sizeof(ULONG),
+					PAG_WRITE | PAG_READ | PAG_COMMIT) != 0)
+			{
+				DosCloseMutexSem((*psem).hmtx);
 
-			return(SEM_FAILED);
-		}
+				sys_free(nom_absolu);
+				sys_free(nom_segment);
+				sys_free(psem);
 
-		free(nom_segment);
+				return(SEM_FAILED);
+			}
 
-		(*psem).cnt = (ULONG *) base;
-		(*psem).nopened = ((ULONG *) base) + 1;
-		(*(*psem).cnt) = valeur;
-		(*(*psem).nopened) = 1;
-		(*psem).shared = 1;
-		semaphore = psem;
+			sys_free(nom_segment);
 
+			(*psem).cnt = (ULONG *) base;
+			(*psem).nopened = ((ULONG *) base) + 1;
+			(*(*psem).cnt) = valeur;
+			(*(*psem).nopened) = 1;
+			(*psem).shared = 1;
+			semaphore = psem;
 #		endif
 	}
 
@@ -899,84 +1113,70 @@ sem_close_SysV(sem_t *semaphore)
 #	ifndef OS2 // IPCS_SYSV
 		if ((*semaphore).path != NULL)
 		{
-			free((*semaphore).path);
+			sys_free((*semaphore).path);
 		}
 
 		if ((*semaphore).alloue == -1)
 		{
-			free(semaphore);
+			sys_free(semaphore);
 		}
 
 		return(0);
 #	else
+		sem_t		*psem;
 
-	sem_t		*psem;
-
-	psem = semaphore;
+		psem = semaphore;
 
-	if (DosCloseMutexSem((*psem).hmtx) != 0)
-	{
-		return(EINVAL);
-	}
+		if (DosCloseMutexSem((*psem).hmtx) != 0)
+		{
+			return(EINVAL);
+		}
 
-	while(DosCloseEventSem((*psem).hev) == ERROR_SEM_BUSY)
-	{
-		DosPostEventSem((*psem).hev);
-	}
+		while(DosCloseEventSem((*psem).hev) == ERROR_SEM_BUSY)
+		{
+			DosPostEventSem((*psem).hev);
+		}
 
-	(*(*psem).nopened)--;
+		(*(*psem).nopened)--;
 
-	if ((*psem).shared == 0)
-	{
-		free((*psem).cnt);
-		free((*psem).nopened);
-	}
-	else
-	{
-		if ((*(*psem).nopened) == 0)
+		if ((*psem).shared == 0)
 		{
-			DosFreeMem((*psem).cnt);
+			sys_free((*psem).cnt);
+			sys_free((*psem).nopened);
+		}
+		else
+		{
+			if ((*(*psem).nopened) == 0)
+			{
+				DosFreeMem((*psem).cnt);
+			}
 		}
-	}
-
-	if ((*psem).allocated != 0)
-	{
-		free(psem);
-	}
 
-	return(0);
+		if ((*psem).allocated != 0)
+		{
+			sys_free(psem);
+		}
 
+		return(0);
 #	endif
 }
 
 int
-sem_unlink_SysV(const char *nom)
+sem_unlink_SysV(char *nom)
 {
 	// Détruit un sémaphore nommé créé par sem_open_SysV()
 #	ifndef OS2 // IPCS_SYSV
-		unsigned char		*nom_absolu;
+		semctl(semget(ftok(nom, 1), 0, 0), 0, IPC_RMID);
 
-		if ((nom_absolu = malloc((strlen(racine_segment) + strlen(nom)
-				+ 2) * sizeof(unsigned char))) == NULL)
+		if (unlink(nom) == -1)
 		{
-			return(ENOMEM);
-		}
-
-		sprintf(nom_absolu, "%s/%s", racine_segment, nom);
-		semctl(semget(ftok(nom_absolu, 1), 0, 0), 0, IPC_RMID);
-
-		if (unlink(nom_absolu) == -1)
-		{
-			free(nom_absolu);
 			return(EACCES);
 		}
 
-		free(nom_absolu);
+		sys_free(nom);
 		return(0);
 #	else
-
-	return(0);
-
+		return(0);
 #	endif
 }