summaryrefslogtreecommitdiff
path: root/source/lib/util.c
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1997-07-03 20:45:06 +0000
committerSamba Release Account <samba-bugs@samba.org>1997-07-03 20:45:06 +0000
commit26635733a746dee2435da7ce228def5f2f292bba (patch)
treeafcb9e053eaec668548b0ac3bf348acdbe956d8d /source/lib/util.c
parent16f6bf700f99357c7467d52b65de42ecff533636 (diff)
downloadsamba-26635733a746dee2435da7ce228def5f2f292bba.tar.gz
Makefile: Added DGUX changes for intel.
namedbwork.c: Minor tidyup for election flah. util.c: Fix for broken readdir detectino code. version.h: Back to 1.9.17alpha3 - will be updated by release script. Jeremy jallison@whistle.com
Diffstat (limited to 'source/lib/util.c')
-rw-r--r--source/lib/util.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/lib/util.c b/source/lib/util.c
index b9b647395b9..31cb4d6629d 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -3403,13 +3403,6 @@ char *readdirname(void *p)
dname = ptr->d_name;
- {
- static pstring buf;
- strcpy(buf, dname);
- unix_to_dos(buf, True);
- dname = buf;
- }
-
#ifdef NEXT2
if (telldir(p) < 0) return(NULL);
#endif
@@ -3425,10 +3418,17 @@ char *readdirname(void *p)
broken_readdir = True;
}
if (broken_readdir)
- return(dname-2);
+ dname = dname - 2;
}
#endif
+ {
+ static pstring buf;
+ strcpy(buf, dname);
+ unix_to_dos(buf, True);
+ dname = buf;
+ }
+
return(dname);
}