From: Art Cancro <ajc@citadel.org>
Date: Fri, 29 Dec 2017 23:10:19 +0000 (-0500)
Subject: replace deprecated readdir_r() with readdir()
X-Git-Tag: v939~477
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=4f16550e3fe10c62b691b3976ff8b4fccc9dd830

replace deprecated readdir_r() with readdir()
---

diff --git a/citadel/modules/bio/serv_bio.c b/citadel/modules/bio/serv_bio.c
index 2436cbfe7..1c03c4805 100644
--- a/citadel/modules/bio/serv_bio.c
+++ b/citadel/modules/bio/serv_bio.c
@@ -2,7 +2,7 @@
  * This module implementsserver commands related to the display and
  * manipulation of user "bio" files.
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -166,8 +166,7 @@ void import_old_bio_files(void)
 		free(d);
 		return;
 	}
-	while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;
diff --git a/citadel/modules/image/serv_image.c b/citadel/modules/image/serv_image.c
index 367814e9f..a7960b100 100644
--- a/citadel/modules/image/serv_image.c
+++ b/citadel/modules/image/serv_image.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -297,8 +297,7 @@ void import_old_userpic_files(void)
 		free(d);
 		return;
 	}
-	while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;
diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 7ca9edcd8..34ad8a6c4 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -826,8 +826,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
 		return;
 	}
 
-	while ((readdir_r(dp, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;
@@ -928,8 +927,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 	memset(&FDIO, 0, sizeof(FDIOBuffer));
 	FDIO.IOB = &IOB;
 
-	while ((readdir_r(dp, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;
@@ -1060,8 +1058,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 		return;
 	}
 
-	while ((readdir_r(dp, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;
diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index c66bd8dde..2508712a2 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -415,7 +415,6 @@ void progress(char *text, long int curr, long int cmax)
 }
 
 
-
 int uds_connectsock(char *sockpath)
 {
 	int s;
@@ -618,18 +617,21 @@ void check_xinetd_entry(void)
 		"	server_args	= -h -L %s/citadel\n"
 		"	log_on_failure	+= USERID\n"
 		"}\n",
-		ctdl_bin_dir);
+		ctdl_bin_dir
+	);
 	fclose(fp);
 
-	/* Now try to restart the service */
-	rv = system("/etc/init.d/xinetd restart >/dev/null 2>&1");
+	/* Now try to restart the service.  This will not have the intended effect on Solaris, but who the hell uses Solaris anymore? */
+	rv = system("systemctl restart xinetd >/dev/null 2>&1");
+	if (rv != 0) {
+		rv = system("service xinetd restart >/dev/null 2>&1");
+	}
 	if (rv != 0) {
 		display_error(_("failed to restart xinetd.\n"));
 	}
 }
 
 
-
 /*
  * Offer to disable other MTA's
  */
@@ -1275,15 +1277,15 @@ int main(int argc, char *argv[])
 	 * Restart citserver
 	 */
 	activity = _("Restarting Citadel server to apply changes");
-	progress(activity, 0, 41);
+	progress(activity, 0, 51);
 
 	serv_puts("TIME");
 	serv_gets(buf);
 	long original_start_time = extract_long(&buf[4], 3);
 
-	progress(activity, 1, 41);
+	progress(activity, 1, 51);
 	serv_puts("DOWN 1");
-	progress(activity, 2, 41);
+	progress(activity, 2, 51);
 	serv_gets(buf);
 	if (buf[0] != '2') {
 		display_error("%s\n", buf);
@@ -1294,26 +1296,26 @@ int main(int argc, char *argv[])
 	serv_sock = (-1);
 
 	for (i=3; i<=6; ++i) {					/* wait for server to shut down */
-		progress(activity, i, 41);
+		progress(activity, i, 51);
 		sleep(1);
 	}
 
-	for (i=7; ((i<=38) && (serv_sock < 0)) ; ++i) {		/* wait for server to start up */
-		progress(activity, i, 41);
+	for (i=7; ((i<=48) && (serv_sock < 0)) ; ++i) {		/* wait for server to start up */
+		progress(activity, i, 51);
         	serv_sock = uds_connectsock(file_citadel_admin_socket);
 		sleep(1);
 	}
 
-	progress(activity, 39, 41);
+	progress(activity, 49, 51);
 	serv_gets(buf);
 
-	progress(activity, 40, 41);
+	progress(activity, 50, 51);
 	serv_puts("TIME");
 	serv_gets(buf);
 	long new_start_time = extract_long(&buf[4], 3);
 
 	close(serv_sock);
-	progress(activity, 41, 41);
+	progress(activity, 51, 51);
 
 	if (	(original_start_time == new_start_time)
 		|| (new_start_time <= 0)