[patch] Patch sent upstream

mail (text/plain), 2.56 KB, created by Felix Janda on 2015-01-31 10:48:55 UTC

fixes compilation with musl libc
---
 src/database.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/database.c b/src/database.c
index 60135ac..2a8f054 100644
--- a/src/database.c
+++ b/src/database.c
@@ -32,6 +32,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -252,7 +253,7 @@ process_crontab(const char *uname, const char *fname, const char *tabname,
 static int
 cluster_host_is_local(void)
 {
-	char filename[MAXNAMLEN+1];
+	char filename[NAME_MAX+1];
 	int is_local;
 	FILE *f;
 	char hostname[MAXHOSTNAMELEN], myhostname[MAXHOSTNAMELEN];
@@ -348,7 +349,7 @@ void check_inotify_database(cron_db * old_db) {
 		}
 		else {
 			while (NULL != (dp = readdir(dir))) {
-				char tabname[MAXNAMLEN + 1];
+				char tabname[NAME_MAX + 1];
 
 				if (not_a_crontab(dp))
 					continue;
@@ -366,12 +367,12 @@ void check_inotify_database(cron_db * old_db) {
 		}
 		else {
 			while (NULL != (dp = readdir(dir))) {
-				char fname[MAXNAMLEN + 1], tabname[MAXNAMLEN + 1];
+				char fname[NAME_MAX + 1], tabname[NAME_MAX + 1];
 
 				if (not_a_crontab(dp))
 					continue;
 
-				strncpy(fname, dp->d_name, MAXNAMLEN);
+				strncpy(fname, dp->d_name, NAME_MAX);
 
 				if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR,
 						dp->d_name, '/'))
@@ -492,7 +493,7 @@ int load_database(cron_db * old_db) {
 	}
 	else {
 		while (NULL != (dp = readdir(dir))) {
-			char tabname[MAXNAMLEN + 1];
+			char tabname[NAME_MAX + 1];
 
 			if (not_a_crontab(dp))
 				continue;
@@ -519,12 +520,12 @@ int load_database(cron_db * old_db) {
 		is_local = cluster_host_is_local();
 
 		while (is_local && NULL != (dp = readdir(dir))) {
-			char fname[MAXNAMLEN + 1], tabname[MAXNAMLEN + 1];
+			char fname[NAME_MAX + 1], tabname[NAME_MAX + 1];
 
 			if (not_a_crontab(dp))
 				continue;
 
-			strncpy(fname, dp->d_name, MAXNAMLEN);
+			strncpy(fname, dp->d_name, NAME_MAX);
 
 			if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, fname, '/'))
 				continue;	/* XXX log? */
@@ -601,7 +602,7 @@ static int not_a_crontab(DIR_T * dp) {
 
 	len = strlen(dp->d_name);
 
-	if (len >= MAXNAMLEN)
+	if (len >= NAME_MAX)
 		return (1);	/* XXX log? */
 
 	if ((len > 0) && (dp->d_name[len - 1] == '~'))
@@ -628,7 +629,7 @@ static void max_mtime(const char *dir_name, struct stat *max_st) {
 	}
 
 	while (NULL != (dp = readdir(dir))) {
-		char tabname[MAXNAMLEN + 1];
+		char tabname[NAME_MAX + 1];
 
 		if ( not_a_crontab ( dp ) && strcmp(dp->d_name, CRON_HOSTNAME) != 0)
 			continue;
-- 
2.0.4