Use is_absolute_path() in diff-lib.c, lockfile.c, setup.c, trace.c

Using the helper function to test for absolute paths makes porting easier.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff-lib.c b/diff-lib.c
index f8e936ae1008fdb7ef8e1722afb839d84c724f6c..d85d8f34ba055ad7e02bf5d61ae4a675ce0be1d3 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -231,7 +231,7 @@ static int handle_diff_files_args(struct rev_info *revs,
 static int is_outside_repo(const char *path, int nongit, const char *prefix)
 {
        int i;
 static int is_outside_repo(const char *path, int nongit, const char *prefix)
 {
        int i;

-       if (nongit || !strcmp(path, "-") || path[0] == '/')
+       if (nongit || !strcmp(path, "-") || is_absolute_path(path))

                return 1;
        if (prefixcmp(path, "../"))
                return 0;
                return 1;
        if (prefixcmp(path, "../"))
                return 0;

diff --git a/lockfile.c b/lockfile.c
index 258fb3f5ef8636e7ff144f551689da3090518a0e..f45d3ed54454635b84cfe9b8c1e7d99d33ffd4d9 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -94,7 +94,7 @@ static char *resolve_symlink(char *p, size_t s)
                        return p;
                }
 
                        return p;
                }
 

-               if (link[0] == '/') {
+               if (is_absolute_path(link)) {

                        /* absolute path simply replaces p */
                        if (link_len < s)
                                strcpy(p, link);
                        /* absolute path simply replaces p */
                        if (link_len < s)
                                strcpy(p, link);

diff --git a/setup.c b/setup.c
index 43cd3f94ea31a7a2a8f8a07cbb67598bb1e52c39..2c7b5cb200414a0fa3f2727c68ea60e51b39c261 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -59,7 +59,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
 const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
 {
        static char path[PATH_MAX];
 const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
 {
        static char path[PATH_MAX];

-       if (!pfx || !*pfx || arg[0] == '/')
+       if (!pfx || !*pfx || is_absolute_path(arg))

                return arg;
        memcpy(path, pfx, pfx_len);
        strcpy(path + pfx_len, arg);
                return arg;
        memcpy(path, pfx, pfx_len);
        strcpy(path + pfx_len, arg);

diff --git a/trace.c b/trace.c
index 0d89dbe7794dcdfb8519e6d083f74bf792976c6a..d3d1b6d55e86aab94ddb9712f5eee743b3bfa9a8 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -37,7 +37,7 @@ static int get_trace_fd(int *need_close)
                return STDERR_FILENO;
        if (strlen(trace) == 1 && isdigit(*trace))
                return atoi(trace);
                return STDERR_FILENO;
        if (strlen(trace) == 1 && isdigit(*trace))
                return atoi(trace);

-       if (*trace == '/') {
+       if (is_absolute_path(trace)) {

                int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
                if (fd == -1) {
                        fprintf(stderr,
                int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
                if (fd == -1) {
                        fprintf(stderr,