68 lines
2.9 KiB
Plaintext
68 lines
2.9 KiB
Plaintext
$NetBSD: patch-ah,v 1.1.1.1 2011/02/16 17:10:41 thomasklausner Exp $
|
|
|
|
--- src/dmd/tk/filespec.c.orig 2010-12-20 20:02:36.000000000 +0000
|
|
+++ src/dmd/tk/filespec.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <ctype.h>
|
|
#endif
|
|
|
|
-#if M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
@@ -87,7 +87,7 @@ char * filespecaddpath(const char *path,
|
|
/**********************/
|
|
char * filespecrootpath(char *filespec)
|
|
{
|
|
-#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
#define DIRCHAR '/'
|
|
#endif
|
|
#if MSDOS || __OS2__ || __NT__ || _WIN32
|
|
@@ -112,7 +112,7 @@ char * filespecrootpath(char *filespec)
|
|
#endif
|
|
|
|
/* get current working directory path */
|
|
-#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
cwd_t = (char *)getcwd(NULL, 256);
|
|
#endif
|
|
#if MSDOS || __OS2__ || __NT__ || _WIN32
|
|
@@ -133,7 +133,7 @@ char * filespecrootpath(char *filespec)
|
|
if (cwd[strlen(cwd) - 1] == DIRCHAR)
|
|
cwd[strlen(cwd) - 1] = '\0';
|
|
#endif
|
|
-#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
free(cwd_t);
|
|
#endif
|
|
p = filespec;
|
|
@@ -150,7 +150,7 @@ char * filespecrootpath(char *filespec)
|
|
{
|
|
cwd_t = cwd;
|
|
cwd = (char *)mem_calloc(strlen(cwd_t) + 1 + strlen(p) + 1);
|
|
-#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
sprintf(cwd, "%s/%s", cwd_t, p); /* add relative directory */
|
|
#endif
|
|
#if MSDOS || __OS2__ || __NT__ || _WIN32
|
|
@@ -171,7 +171,7 @@ char * filespecrootpath(char *filespec)
|
|
{ /* ... save remaining string */
|
|
cwd_t = cwd;
|
|
cwd = (char *)mem_calloc(strlen(cwd_t) + 1 + strlen(p) + 1);
|
|
-#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if SUN || M_UNIX || M_XENIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
sprintf(cwd, "%s/%s", cwd_t, p); /* add relative directory */
|
|
#endif
|
|
#if MSDOS || __OS2__ || __NT__ || _WIN32
|
|
@@ -402,7 +402,7 @@ char * filespecbackup(const char *filesp
|
|
#if MSDOS || __OS2__ || __NT__ || _WIN32
|
|
return filespecforceext(filespec,"BAK");
|
|
#endif
|
|
-#if BSDUNIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
|
|
+#if BSDUNIX || linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4 || __NetBSD__
|
|
char *p,*f;
|
|
|
|
/* Prepend .B to file name, if it isn't already there */
|