Bash-5.3-alpha release

lib/sh/makepath.c

@@ -1,6 +1,6 @@
 /* makepath.c - glue PATH and DIR together into a full pathname. */
 
-/* Copyright (C) 1987-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2020,2022-2024 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -32,10 +32,6 @@
 
 #include <tilde/tilde.h>
 
-#ifndef NULL
-#  define NULL 0
-#endif
-
 /* MAKE SURE THESE AGREE WITH ../../externs.h. */
 
 #ifndef MP_DOTILDE
@@ -45,7 +41,7 @@
 #  define MP_IGNDOT	0x08
 #endif
 
-extern char *get_working_directory PARAMS((char *));
+extern char *get_working_directory (char *);
 
 static char *nullpath = "";
 
@@ -67,11 +63,9 @@ static char *nullpath = "";
   } while (0)
 
 char *
-sh_makepath (path, dir, flags)
-     const char *path, *dir;
-     int flags;
+sh_makepath (const char *path, const char *dir, int flags)
 {
-  int dirlen, pathlen;
+  size_t dirlen, pathlen;
   char *ret, *xpath, *xdir, *r, *s;
 
   if (path == 0 || *path == '\0')