Mercurial > molko
changeset 524:c2124ecb2423
util: prefix PATH_MAX to MLK_PATH_MAX
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sat, 04 Mar 2023 19:22:06 +0100 |
| parents | 81f7a432082f |
| children | 00e7ad6938ae |
| files | libmlk-core/mlk/core/sys.c libmlk-core/mlk/core/util.c libmlk-rpg/mlk/rpg/map-file.c libmlk-rpg/mlk/rpg/tileset-file.c libmlk-util/mlk/util/openbsd/basename.c libmlk-util/mlk/util/openbsd/dirname.c libmlk-util/mlk/util/util.h mlk-map/mlk-map.c |
| diffstat | 8 files changed, 20 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libmlk-core/mlk/core/sys.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-core/mlk/core/sys.c Sat Mar 04 19:22:06 2023 +0100 @@ -80,7 +80,7 @@ /* Kept for future use. */ (void)kind; - static char path[PATH_MAX]; + static char path[MLK_PATH_MAX]; char *pref; if ((pref = SDL_GetPrefPath(info.organization, info.name))) { @@ -216,7 +216,7 @@ int mlk_sys_mkdir(const char *directory) { - char path[PATH_MAX], *p; + char path[MLK_PATH_MAX], *p; /* Copy the directory to normalize and iterate over '/'. */ mlk_util_strlcpy(path, directory, sizeof (path));
--- a/libmlk-core/mlk/core/util.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-core/mlk/core/util.c Sat Mar 04 19:22:06 2023 +0100 @@ -35,7 +35,7 @@ const char * mlk_util_pathf(const char *fmt, ...) { - static char path[PATH_MAX]; + static char path[MLK_PATH_MAX]; va_list ap; va_start(ap, fmt);
--- a/libmlk-rpg/mlk/rpg/map-file.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/map-file.c Sat Mar 04 19:22:06 2023 +0100 @@ -40,7 +40,7 @@ struct map_file *mf; /* Map loader. */ struct map *map; /* Map object to fill. */ FILE *fp; /* Map file pointer. */ - char basedir[PATH_MAX]; /* Parent map directory */ + char basedir[MLK_PATH_MAX]; /* Parent map directory */ }; static int @@ -140,7 +140,7 @@ static int parse_tileset(struct context *ctx, const char *line) { - char path[PATH_MAX] = {0}, *p; + char path[MLK_PATH_MAX] = {0}, *p; struct map_file *mf = ctx->mf; struct tileset_file *tf = &mf->tileset_file; @@ -220,8 +220,7 @@ static int parse(struct context *ctx, const char *path) { - char line[1024]; - char basedir[PATH_MAX]; + char line[1024], basedir[MLK_PATH_MAX]; mlk_util_strlcpy(basedir, path, sizeof (basedir)); mlk_util_strlcpy(ctx->basedir, mlk_util_dirname(basedir), sizeof (ctx->basedir));
--- a/libmlk-rpg/mlk/rpg/tileset-file.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/tileset-file.c Sat Mar 04 19:22:06 2023 +0100 @@ -74,7 +74,7 @@ struct tileset *tileset; FILE *fp; - char basedir[PATH_MAX]; + char basedir[MLK_PATH_MAX]; /* * The following properties aren't stored in the tileset because they @@ -279,8 +279,7 @@ static int parse(struct context *ctx, const char *path) { - char line[1024]; - char basedir[PATH_MAX]; + char line[1024], basedir[MLK_PATH_MAX]; mlk_util_strlcpy(basedir, path, sizeof (basedir)); mlk_util_strlcpy(ctx->basedir, mlk_util_dirname(basedir), sizeof (ctx->basedir));
--- a/libmlk-util/mlk/util/openbsd/basename.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-util/mlk/util/openbsd/basename.c Sat Mar 04 19:22:06 2023 +0100 @@ -20,14 +20,12 @@ #include <limits.h> #include <string.h> -#ifndef PATH_MAX -# define PATH_MAX 2048 -#endif +#include <mlk/util/util.h> char * mlk_util_basename(char *path) { - static char bname[PATH_MAX]; + static char bname[MLK_PATH_MAX]; size_t len; const char *endp, *startp;
--- a/libmlk-util/mlk/util/openbsd/dirname.c Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-util/mlk/util/openbsd/dirname.c Sat Mar 04 19:22:06 2023 +0100 @@ -20,14 +20,12 @@ #include <limits.h> #include <string.h> -#ifndef PATH_MAX -# define PATH_MAX 2048 -#endif +#include <mlk/util/util.h> char * mlk_util_dirname(char *path) { - static char dname[PATH_MAX]; + static char dname[MLK_PATH_MAX]; size_t len; const char *endp;
--- a/libmlk-util/mlk/util/util.h Sat Mar 04 17:12:14 2023 +0100 +++ b/libmlk-util/mlk/util/util.h Sat Mar 04 19:22:06 2023 +0100 @@ -12,8 +12,7 @@ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef MLK_PORT_H @@ -61,8 +60,12 @@ # define MLK_OS_APPLE #endif -#if !defined(PATH_MAX) -# define PATH_MAX 2048 +#if defined(PATH_MAX) +# define MLK_PATH_MAX PATH_MAX +#elif defined(_POSIX_PATH_MAX) +# define MLK_PATH_MAX _POSIX_PATH_MAX +#else +# define MLK_PATH_MAX 4096 #endif #if defined(MLK_OS_POSIX) && !defined(MLK_HAS_SSIZE_T)
--- a/mlk-map/mlk-map.c Sat Mar 04 17:12:14 2023 +0100 +++ b/mlk-map/mlk-map.c Sat Mar 04 19:22:06 2023 +0100 @@ -212,7 +212,7 @@ static void write_tileset(const json_t *tilesets) { - char path[PATH_MAX]; + char path[MLK_PATH_MAX]; char filename[FILENAME_MAX] = {0}, *ext; const json_t *tileset, *source;