Various: use NUT_PATH_MAX instead of PATH_MAX, MAX_PATH, MAXPATHLEN, …

…UNIX_PATH_MAX etc. [#2764]

Signed-off-by: Jim Klimov <[email protected]>

clients/upssched.c

@@ -970,14 +970,14 @@ static void start_daemon(TYPE_FD lockfd)
 	DWORD timeout_ms;
 	HANDLE rfds[32];
 
-	char module[MAX_PATH];
+	char module[NUT_PATH_MAX];
 	STARTUPINFO sinfo;
 	PROCESS_INFORMATION pinfo;
-	if( !GetModuleFileName(NULL,module,MAX_PATH) ) {
+	if (!GetModuleFileName(NULL, module, NUT_PATH_MAX)) {
 		fatal_with_errno(EXIT_FAILURE, "Can't retrieve module name");
 	}
 	memset(&sinfo,0,sizeof(sinfo));
-	if(!CreateProcess(module, NULL, NULL,NULL,FALSE,0,NULL,NULL,&sinfo,&pinfo)) {
+	if (!CreateProcess(module, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) {
 		fatal_with_errno(EXIT_FAILURE, "Can't create child process");
 	}
 	pipefd = open_sock();

common/common.c

@@ -1661,7 +1661,7 @@ int checkprocname(pid_t pid, const char *progname)
    depending on the .exe path */
 char * getfullpath(char * relative_path)
 {
-	char buf[MAX_PATH];
+	char buf[NUT_PATH_MAX];
 	if ( GetModuleFileName(NULL, buf, sizeof(buf)) == 0 ) {
 		return NULL;
 	}
@@ -1682,7 +1682,7 @@ char * getfullpath(char * relative_path)
 void writepid(const char *name)
 {
 #ifndef WIN32
-	char	fn[SMALLBUF];
+	char	fn[NUT_PATH_MAX];
 	FILE	*pidf;
 	mode_t	mask;
 

common/nutstream.cpp

@@ -242,7 +242,7 @@ static const char* getTmpDirPath() {
 
 #ifdef WIN32
 	/* Suggestions from https://sourceforge.net/p/mingw/bugs/666/ */
-	static char pathbuf[MAX_PATH];
+	static char pathbuf[NUT_PATH_MAX];
 	int i;
 #endif
 
@@ -255,7 +255,7 @@ static const char* getTmpDirPath() {
 
 #ifdef WIN32
 	i = GetTempPathA(sizeof(pathbuf), pathbuf);
-	if ((i > 0) && (i < MAX_PATH) && checkExistsWritableDir(pathbuf))
+	if ((i > 0) && (i < NUT_PATH_MAX) && checkExistsWritableDir(pathbuf))
 		return (const char *)pathbuf;
 #endif
 
@@ -328,7 +328,7 @@ NutFile::NutFile(anonymous_t):
 	/* Suggestions from https://sourceforge.net/p/mingw/bugs/666/ because
 	 * msvcrt tmpfile() uses C: root dir and lacks permissions to actually
 	 * use it, and mingw tends to call that OS method so far */
-	char filename[MAX_PATH];
+	char filename[NUT_PATH_MAX];
 	memset(filename, 0, sizeof(filename));
 
 	GetTempFileNameA(m_tmp_dir.c_str(), "nuttemp", 0, filename);

drivers/hwmon_ina219.c

@@ -50,7 +50,7 @@ upsdrv_info_t upsdrv_info = {
 /**
  * @brief Path usually pointing to /sys/class/hwmon/hwmonX.
  */
-static char ina219_base_path[PATH_MAX];
+static char ina219_base_path[NUT_PATH_MAX];
 
 /**
  * @brief Threshold for detection of LB status.
@@ -128,7 +128,7 @@ static int file_read_number(const char *path, int *value)
 
 static int detect_ina219(const char *ina219_dir)
 {
-	char namepath[PATH_MAX];
+	char namepath[NUT_PATH_MAX];
 
 	upsdebugx(3, "checking %s", ina219_dir);
 
@@ -166,7 +166,7 @@ static int scan_hwmon_ina219(const char *sysfs_hwmon_dir)
 	}
 
 	while ((entry = readdir(sysfs)) != NULL) {
-		char hwmon_dir[PATH_MAX];
+		char hwmon_dir[NUT_PATH_MAX];
 
 		if (entry->d_type != DT_DIR && entry->d_type != DT_LNK) {
 			upsdebugx(3, "path %s/%s is not directory/symlink", sysfs_hwmon_dir,
@@ -204,10 +204,10 @@ static int update_intvar(
 	const char *name,
 	int *value)
 {
-	char path[PATH_MAX];
+	char path[NUT_PATH_MAX];
 	int ret;
 
-	if (snprintf(path, sizeof(path), "%s/%s", base_path, name) >= PATH_MAX) {
+	if (snprintf(path, sizeof(path), "%s/%s", base_path, name) >= NUT_PATH_MAX) {
 		errno = ENAMETOOLONG;
 		upslog_with_errno(LOG_ERR, "snprintf(%s/%s) has failed", base_path, name);
 		return -ENAMETOOLONG;

drivers/nhs_ser.c

@@ -224,7 +224,7 @@ static unsigned int	max_checktime = 6000000;	/* max wait time: 6 seconds */
 static unsigned int	send_extended = 0;
 static int		bwritten = 0;
 static unsigned char	datapacket[DATAPACKETSIZE];
-static char		porta[PATH_MAX] = DEFAULTPORT;
+static char		porta[NUT_PATH_MAX] = DEFAULTPORT;
 static int		baudrate = DEFAULTBAUD;
 static float		minpower = 0;
 static float		maxpower = 0;

include/wincompat.h

@@ -350,11 +350,4 @@ speed_t cfgetospeed(const struct termios *t);
 #define TIOCM_RI	TIOCM_RNG /* at least that's the definition in Linux */
 #define TIOCM_CD	MS_RLSD_ON /*0x0080*/
 
-#if !defined(PATH_MAX) && defined(MAX_PATH)
-/* PATH_MAX is the POSIX equivalent for Microsoft's MAX_PATH
- * both should be defined in (mingw) limits.h
- */
-# define PATH_MAX MAX_PATH
-#endif
-
 #endif /* NUT_WINCOMPAT_H */

scripts/Windows/wininit.c

@@ -145,7 +145,7 @@ static const char * makearg_debug(void)
 /* return PID of created process or 0 on failure */
 static DWORD run_drivers(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 
 	path = getfullpath(PATH_BIN);
@@ -162,7 +162,7 @@ static DWORD run_drivers(void)
 /* return PID of created process or 0 on failure */
 static DWORD stop_drivers(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 
 	path = getfullpath(PATH_BIN);
@@ -179,7 +179,7 @@ static DWORD stop_drivers(void)
 /* return PID of created process or 0 on failure */
 static void run_upsd(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 
 	path = getfullpath(PATH_SBIN);
@@ -201,7 +201,7 @@ static void stop_upsd(void)
 /* return PID of created process or 0 on failure */
 static void run_upsmon(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 
 	path = getfullpath(PATH_SBIN);
@@ -223,7 +223,7 @@ static void stop_upsmon(void)
 /* Return 0 if powerdown flag is set */
 static DWORD test_powerdownflag(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 	STARTUPINFO StartupInfo;
 	PROCESS_INFORMATION ProcessInformation;
@@ -279,7 +279,7 @@ static DWORD test_powerdownflag(void)
 
 static DWORD shutdown_ups(void)
 {
-	char command[MAX_PATH];
+	char command[NUT_PATH_MAX];
 	char *path;
 
 	path = getfullpath(PATH_BIN);
@@ -373,9 +373,9 @@ static int SvcInstall(const char * SvcName, const char * args)
 {
 	SC_HANDLE SCManager;
 	SC_HANDLE Service;
-	TCHAR Path[MAX_PATH];
+	TCHAR Path[NUT_PATH_MAX];
 
-	if (!GetModuleFileName(NULL, Path, MAX_PATH)) {
+	if (!GetModuleFileName(NULL, Path, NUT_PATH_MAX)) {
 		printf("Cannot install service (%d)\n", (int)GetLastError());
 		return EXIT_FAILURE;
 	}

server/sstate.c

@@ -224,7 +224,7 @@ TYPE_FD sstate_connect(upstype_t *ups)
 			upsdebugx(2, "%s: failed to connect() UNIX socket %s (%s)",
 				__func__, NUT_STRARG(ups->fn), sa.sun_path);
 		} else {
-			char	cwd[PATH_MAX+1];
+			char	cwd[NUT_PATH_MAX+1];
 			upsdebugx(2, "%s: failed to connect() UNIX socket %s (%s/%s)",
 				__func__, NUT_STRARG(ups->fn),
 				getcwd(cwd, sizeof(cwd)), sa.sun_path);
@@ -241,7 +241,7 @@ TYPE_FD sstate_connect(upstype_t *ups)
 			upslog_with_errno(LOG_ERR, "Can't connect to UPS [%s] (%s)",
 				ups->name, ups->fn);
 		} else {
-			char	cwd[PATH_MAX+1];
+			char	cwd[NUT_PATH_MAX+1];
 			upslog_with_errno(LOG_ERR, "Can't connect to UPS [%s] (%s/%s)",
 				ups->name, getcwd(cwd, sizeof(cwd)), ups->fn);
 		}