Changeset: 2d830e3c3322 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d830e3c3322
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
common/utils/msabaoth.c
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_type.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/vault.c
sql/backends/monet5/wlr.c
tools/mserver/mserver5.c
Branch: default
Log Message:
Use the C standard constant FILENAME_MAX for buffers with file names.
diffs (truncated from 882 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2326,8 +2326,8 @@ int mnstr_writeInt_wrap(Stream *S, int *
str mnstr_writeIntwrap(void *ret, Stream *S, int *data);
int mnstr_write_string(Stream *S, str data);
str mnstr_write_stringwrap(void *ret, Stream *S, str *data);
-char monet_characteristics[PATHLENGTH];
-char monet_cwd[PATHLENGTH];
+char monet_characteristics[4096];
+char monet_cwd[FILENAME_MAX];
size_t monet_memory;
void moveInstruction(MalBlkPtr mb, int pc, int target);
void mserver_reset(int exit);
@@ -2586,7 +2586,7 @@ str vectorRef;
str wlcRef;
int wlc_batches;
int wlc_beat;
-char wlc_dir[PATHLENGTH];
+char wlc_dir[FILENAME_MAX];
lng wlc_id;
MT_Lock wlc_lock;
int wlc_state;
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -30,8 +30,6 @@
#include <errno.h>
-#define PATHLENGTH 256 /* maximum file pathname length. */
-
static const char *sql_commands[] = {
"SELECT",
"INSERT",
@@ -49,7 +47,7 @@ static const char *sql_commands[] = {
};
static Mapi _mid;
-static char _history_file[PATHLENGTH];
+static char _history_file[FILENAME_MAX];
static int _save_history = 0;
static char *language;
@@ -332,13 +330,13 @@ init_readline(Mapi mid, char *lang, int
if (save_history) {
#ifndef NATIVE_WIN32
if (getenv("HOME") != NULL) {
- snprintf(_history_file, PATHLENGTH,
+ snprintf(_history_file, FILENAME_MAX,
"%s/.mapiclient_history_%s",
getenv("HOME"), language);
_save_history = 1;
}
#else
- snprintf(_history_file, PATHLENGTH,
+ snprintf(_history_file, FILENAME_MAX,
"%s%c_mapiclient_history_%s",
mo_find_option(NULL, 0, "prefix"), DIR_SEP, language);
_save_history = 1;
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -42,8 +42,6 @@
#define fdopen _fdopen
#endif
-#define PATHLENGTH 4096
-
/** the directory where the databases are (aka dbfarm) */
char *_sabaoth_internal_dbfarm = NULL;
/** the database which is "active" */
@@ -203,7 +201,7 @@ msab_init(const char *dbfarm, const char
void
msab_dbpathinit(const char *dbpath)
{
- char dbfarm[PATHLENGTH];
+ char dbfarm[FILENAME_MAX];
const char *p;
p = strrchr(dbpath, DIR_SEP);
@@ -259,7 +257,7 @@ msab_marchScenario(const char *lang)
FILE *f;
char buf[256]; /* should be enough for now */
size_t len;
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), SCENARIOFILE)) != NULL)
@@ -303,7 +301,7 @@ msab_retreatScenario(const char *lang)
FILE *f;
char buf[256]; /* should be enough to hold the entire file */
size_t len;
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), SCENARIOFILE)) != NULL)
@@ -374,7 +372,7 @@ char *
msab_marchConnection(const char *host, const int port)
{
FILE *f;
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), CONNECTIONFILE)) != NULL)
@@ -395,7 +393,7 @@ msab_marchConnection(const char *host, c
(void)fclose(f);
return(NULL);
} else {
- char buf[PATHLENGTH + 1024];
+ char buf[FILENAME_MAX + 1024];
snprintf(buf, sizeof(buf), "failed to open file: %s (%s)",
strerror(errno), pathbuf);
return(strdup(buf));
@@ -411,7 +409,7 @@ msab_marchConnection(const char *host, c
char *
msab_wildRetreat(void)
{
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), SCENARIOFILE)) != NULL)
@@ -450,7 +448,7 @@ msab_registerStarting(void)
* uplog. */
FILE *f;
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), UPLOGFILE)) != NULL)
@@ -462,7 +460,7 @@ msab_registerStarting(void)
(void)fflush(f);
(void)fclose(f);
} else {
- char buf[PATHLENGTH];
+ char buf[FILENAME_MAX];
snprintf(buf, sizeof(buf), "failed to open file: %s (%s)",
strerror(errno), pathbuf);
return(strdup(buf));
@@ -496,7 +494,7 @@ msab_registerStarting(void)
char *
msab_registerStarted(void)
{
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
FILE *fp;
@@ -520,7 +518,7 @@ char *
msab_registerStop(void)
{
FILE *f;
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *tmp;
if ((tmp = getDBPath(pathbuf, sizeof(pathbuf), UPLOGFILE)) != NULL)
@@ -532,7 +530,7 @@ msab_registerStop(void)
(void)fflush(f);
(void)fclose(f);
} else {
- char buf[PATHLENGTH];
+ char buf[FILENAME_MAX];
snprintf(buf, sizeof(buf), "failed to open file: %s (%s)",
strerror(errno), pathbuf);
return(strdup(buf));
@@ -570,9 +568,9 @@ msab_getMyStatus(sabdb** ret)
static sabdb *
msab_getSingleStatus(const char *pathbuf, const char *dbname, sabdb *next)
{
- char buf[PATHLENGTH];
+ char buf[FILENAME_MAX];
char data[8096];
- char log[PATHLENGTH];
+ char log[FILENAME_MAX];
FILE *f;
int fd;
struct stat statbuf;
@@ -734,7 +732,7 @@ msab_getStatus(sabdb** ret, char *dbname
DIR *d;
struct dirent *e;
char data[8096];
- char pathbuf[PATHLENGTH];
+ char pathbuf[FILENAME_MAX];
char *p;
/* Caching strategies (might be nice) should create a new struct with
@@ -819,7 +817,7 @@ msab_freeStatus(sabdb** ret)
char *
msab_getUplogInfo(sabuplog *ret, const sabdb *db)
{
- char log[PATHLENGTH];
+ char log[FILENAME_MAX];
char data[24];
char *p;
FILE *f;
@@ -909,7 +907,7 @@ msab_getUplogInfo(sabuplog *ret, const s
}
(void)fclose(f);
} else {
- char buf[PATHLENGTH];
+ char buf[FILENAME_MAX];
snprintf(buf, sizeof(buf), "could not open file %s: %s",
log, strerror(errno));
return(strdup(buf));
@@ -992,7 +990,7 @@ msab_deserialise(sabdb **ret, char *sdb)
sablist *l;
char *p;
char *lasts;
- char buf[PATHLENGTH];
+ char buf[FILENAME_MAX];
char protover = 0;
lasts = sdb;
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -346,9 +346,6 @@
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>
#endif
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h> /* MAXPATHLEN */
-#endif
#ifdef HAVE_DIRENT_H
# include <dirent.h>
@@ -405,12 +402,6 @@
#define LEFTDIR "bat\\LEFTOVERS"
#endif
-#ifdef MAXPATHLEN
-#define PATHLENGTH MAXPATHLEN
-#else
-#define PATHLENGTH 1024 /* maximum file pathname length */
-#endif
-
/*
See `man mserver5` or tools/mserver/mserver5.1
for a documentation of the following debug options.
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1049,7 +1049,7 @@ fixfloatbats(void)
{
bat bid;
BAT *b;
- char filename[PATHLENGTH];
+ char filename[FILENAME_MAX];
FILE *fp;
size_t len;
@@ -3844,7 +3844,7 @@ BBPdiskscan(const char *parent, size_t b
{
DIR *dirp = opendir(parent);
struct dirent *dent;
- char fullname[PATHLENGTH];
+ char fullname[FILENAME_MAX];
str dst = fullname;
size_t dstlen = sizeof(fullname);
const char *src = parent;
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -166,7 +166,7 @@ HEAPalloc(Heap *h, size_t nitems, size_t
gdk_return
HEAPextend(Heap *h, size_t size, int mayshare)
{
- char nme[PATHLENGTH], *ext = NULL;
+ char nme[FILENAME_MAX], *ext = NULL;
const char *failure = "None";
if (h->filename) {
@@ -326,7 +326,7 @@ HEAPshrink(Heap *h, size_t size)
PTRFMT "\n", h->size, size,
PTRFMTCAST h->base, PTRFMTCAST p);
} else {
- char nme[PATHLENGTH], *ext = NULL;
+ char nme[FILENAME_MAX], *ext = NULL;
char *path;
if (h->filename) {
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1156,7 +1156,7 @@ logger_readlogs(logger *lg, FILE *fp, ch
}
while (fgets(id, sizeof(id), fp) != NULL) {
- char log_filename[PATHLENGTH];
+ char log_filename[FILENAME_MAX];
lng lid = strtoll(id, NULL, 10);
if (lg->debug & 1) {
@@ -1420,8 +1420,8 @@ logger_set_logdir_path(char *filename, c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
