Revision: 77059
http://sourceforge.net/p/brlcad/code/77059
Author: starseeker
Date: 2020-09-04 13:46:49 +0000 (Fri, 04 Sep 2020)
Log Message:
-----------
PATH_MAX->MAXPATHLEN
Modified Paths:
--------------
brlcad/trunk/src/libbu/realpath_bsd.c
brlcad/trunk/src/libbu/whereami.c
Modified: brlcad/trunk/src/libbu/realpath_bsd.c
===================================================================
--- brlcad/trunk/src/libbu/realpath_bsd.c 2020-09-04 13:39:03 UTC (rev
77058)
+++ brlcad/trunk/src/libbu/realpath_bsd.c 2020-09-04 13:46:49 UTC (rev
77059)
@@ -60,7 +60,7 @@
unsigned symlinks;
int serrno, mem_allocated;
ssize_t slen;
- char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
+ char left[MAXPATHLEN], next_token[MAXPATHLEN], symlink[MAXPATHLEN];
if (path == NULL) {
errno = EINVAL;
@@ -75,7 +75,7 @@
serrno = errno;
if (resolved == NULL) {
- resolved = (char *)bu_malloc(PATH_MAX, "alloc PATH_MAX");
+ resolved = (char *)bu_malloc(MAXPATHLEN, "alloc MAXPATHLEN");
if (resolved == NULL)
return (NULL);
mem_allocated = 1;
@@ -91,11 +91,11 @@
resolved_len = 1;
left_len = bu_strlcpy(left, path + 1, sizeof(left));
} else {
- if (getcwd(resolved, PATH_MAX) == NULL) {
+ if (getcwd(resolved, MAXPATHLEN) == NULL) {
if (mem_allocated)
free(resolved);
else
- bu_strlcpy(resolved, ".", PATH_MAX);
+ bu_strlcpy(resolved, ".", MAXPATHLEN);
return (NULL);
}
resolved_len = strlen(resolved);
@@ -129,7 +129,7 @@
}
if (resolved[resolved_len - 1] != '/') {
- if (resolved_len + 1 >= PATH_MAX) {
+ if (resolved_len + 1 >= MAXPATHLEN) {
errno = ENAMETOOLONG;
goto err;
}
@@ -160,8 +160,8 @@
* it exists but isn't a symlink, or if there are no more
* path components left.
*/
- resolved_len = bu_strlcat(resolved, next_token, PATH_MAX);
- if (resolved_len >= PATH_MAX) {
+ resolved_len = bu_strlcat(resolved, next_token, MAXPATHLEN);
+ if (resolved_len >= MAXPATHLEN) {
errno = ENAMETOOLONG;
goto err;
}
Modified: brlcad/trunk/src/libbu/whereami.c
===================================================================
--- brlcad/trunk/src/libbu/whereami.c 2020-09-04 13:39:03 UTC (rev 77058)
+++ brlcad/trunk/src/libbu/whereami.c 2020-09-04 13:46:49 UTC (rev 77059)
@@ -275,7 +275,7 @@
WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
{
- char buffer[PATH_MAX];
+ char buffer[MAXPATHLEN];
char* resolved = NULL;
int length = -1;
@@ -347,12 +347,12 @@
for (;;)
{
- char buffer[PATH_MAX < 1024 ? 1024 : PATH_MAX];
+ char buffer[MAXPATHLEN < 1024 ? 1024 : MAXPATHLEN];
uint64_t low, high;
char perms[5];
uint64_t offset;
uint32_t major, minor;
- char path[PATH_MAX];
+ char path[MAXPATHLEN];
uint32_t inode;
if (!bu_fgets(buffer, sizeof(buffer), maps))
@@ -458,8 +458,8 @@
WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
{
- char buffer1[PATH_MAX];
- char buffer2[PATH_MAX];
+ char buffer1[MAXPATHLEN];
+ char buffer2[MAXPATHLEN];
char* path = buffer1;
char* resolved = NULL;
int length = -1;
@@ -514,7 +514,7 @@
WAI_NOINLINE WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{
- char buffer[PATH_MAX];
+ char buffer[MAXPATHLEN];
char* resolved = NULL;
int length = -1;
@@ -570,8 +570,8 @@
WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
{
- char buffer1[PATH_MAX];
- char buffer2[PATH_MAX];
+ char buffer1[MAXPATHLEN];
+ char buffer2[MAXPATHLEN];
char* resolved = NULL;
FILE* self_exe = NULL;
int length = -1;
@@ -624,7 +624,7 @@
WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{
- char buffer[PATH_MAX];
+ char buffer[MAXPATHLEN];
char* resolved = NULL;
int length = -1;
@@ -678,8 +678,8 @@
WAI_FUNCSPEC
int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
{
- char buffer1[PATH_MAX];
- char buffer2[PATH_MAX];
+ char buffer1[MAXPATHLEN];
+ char buffer2[MAXPATHLEN];
char* path = buffer1;
char* resolved = NULL;
int length = -1;
@@ -736,7 +736,7 @@
WAI_NOINLINE WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{
- char buffer[PATH_MAX];
+ char buffer[MAXPATHLEN];
char* resolved = NULL;
int length = -1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
