From 2b5d7fd2c195a4e8d87979ec60dd3a7dbc80f039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sun, 16 Nov 1997 19:23:14 -0800
Subject: [PATCH] combine_path fixed
Rev: src/builtin_functions.c:1.58
---
src/builtin_functions.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 45e659cbf9..49e348a9f5 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -4,7 +4,7 @@
||| See the files COPYING and DISCLAIMER for more information.
\*/
#include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.57 1997/11/13 22:13:28 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.58 1997/11/17 03:23:14 hubbe Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
@@ -460,8 +460,8 @@ static char *combine_path(char *cwd,char *file)
to++;
}
- if(*cwd && from[-1]!='/' && *ret && ret[-1]=='/')
- *--to=0;
+ if(*ret && from[-1]!='/' && to[-1]=='/')
+ *--to=0;
if(!*ret)
{
--
GitLab