From 9c771d77198b065d90244096a505c2feed9b8c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 22 Jan 1997 09:29:34 +0100
Subject: [PATCH] Fixed a bunch of compiler errors in f_get_dir.
Rev: src/modules/files/efuns.c:1.7
---
src/modules/files/efuns.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index 9ef8ce799f..0b9fb3d8f9 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -180,7 +180,7 @@ void f_get_dir(INT32 args)
{
#define FPR 1024
char buffer[MAXPATHLEN * 4];
- char ptrs[FPR];
+ char *ptrs[FPR];
int lens[FPR];
while(1)
@@ -200,16 +200,16 @@ void f_get_dir(INT32 args)
}
if(num_files >= FPR) break;
lens[num_files]=NAMLEN(d);
- if(ptr+lens[num_files] >= buffer+sizeof(buffer)) break;
- MEMCPY(ptr, d->d_name, lens[num_files]);
- ptrs[num_files]=ptr;
- ptr+=len;
+ if(bufptr+lens[num_files] >= buffer+sizeof(buffer)) break;
+ MEMCPY(bufptr, d->d_name, lens[num_files]);
+ ptrs[num_files]=bufptr;
+ bufptr+=lens[num_files];
num_files++;
}
THREADS_DISALLOW();
for(e=0;e<num_files;e++)
{
- push_string(make_shared_string(ptrs[e],lens[e]));
+ push_string(make_shared_binary_string(ptrs[e],lens[e]));
}
if(d)
push_string(make_shared_binary_string(d->d_name,NAMLEN(d)));
--
GitLab