Use OS-specific paths

In general we need to use ';' as path separator and '\' and directory
separator on windows. The shell will automatically translate paths to
some extent, but we have to call "pwd -W" rather than plain "pwd" to
get something useful.

Change-Id: I1a117d219a2aa00c1f77ae7d3a1d92b9bae526db
Reviewed-by: Christian Kandeler <[email protected]>

4 files changed, 12 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7103770c..0d1e57d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2017-05-04  Ulf Hermann  <[email protected]>
 
+	* addr2line.c: Don't assume unix file system conventions.
+	* size.c: Likewise.
+	* strip.c: Likewise.
+
+2017-05-04  Ulf Hermann  <[email protected]>
+
 	* ar.c: Open files in O_BINARY.
 	* elfcmp.c: Likewise.
 	* elfcompress.c: Likewise.
diff --git a/src/addr2line.c b/src/addr2line.c
index ba414a74..7ee9fcfc 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -375,7 +375,7 @@ print_dwarf_function (Dwfl_Module *mod, Dwarf_Addr addr)
 		    file = "???";
 		  else if (only_basenames)
 		    file = basename (file);
-		  else if (use_comp_dir && file[0] != '/')
+		  else if (use_comp_dir && !IS_ABSOLUTE_PATH(file))
 		    {
 		      const char *const *dirs;
 		      size_t ndirs;
@@ -559,7 +559,7 @@ print_src (const char *src, int lineno, int linecol, Dwarf_Die *cu)
 
   if (only_basenames)
     src = basename (src);
-  else if (use_comp_dir && src[0] != '/')
+  else if (use_comp_dir && !IS_ABSOLUTE_PATH(src))
     {
       Dwarf_Attribute attr;
       comp_dir = dwarf_formstring (dwarf_attr (cu, DW_AT_comp_dir, &attr));
diff --git a/src/size.c b/src/size.c
index 47748004..9e5c20a1 100644
--- a/src/size.c
+++ b/src/size.c
@@ -350,7 +350,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname)
   if (prefix != NULL)
     {
       cp = mempcpy (cp, prefix, prefix_len);
-      *cp++ = ':';
+      *cp++ = PATHSEP;
     }
   memcpy (cp, fname, fname_len);
 
@@ -635,7 +635,7 @@ handle_elf (Elf *elf, const char *prefix, const char *fname)
   if (prefix != NULL)
     {
       cp = mempcpy (cp, prefix, prefix_len);
-      *cp++ = ':';
+      *cp++ = PATHSEP;
     }
   memcpy (cp, fname, fname_len);
 
diff --git a/src/strip.c b/src/strip.c
index db8ff2f5..60f6700e 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -440,7 +440,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
   if (prefix != NULL)
     {
       cp = mempcpy (cp, prefix, prefix_len);
-      *cp++ = ':';
+      *cp++ = PATHSEP;
     }
   memcpy (cp, fname, fname_len);
 
@@ -2263,7 +2263,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname,
   if (prefix != NULL)
     {
       cp = mempcpy (cp, prefix, prefix_len);
-      *cp++ = ':';
+      *cp++ = PATHSEP;
     }
   memcpy (cp, fname, fname_len);