From 2a3c39f7c95804256521a30b2a9c2178589ae204 Mon Sep 17 00:00:00 2001
From: Andreas Sigfridsson <sigge@lysator.liu.se>
Date: Sat, 24 Jul 1999 22:18:10 +0200
Subject: [PATCH] Made get_dir less picky about its first argument.
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.3
---
.gitattributes | 1 +
lib/modules/Filesystem.pmod/Tar.pmod | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index a3a52d9210..ecf252453d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -35,6 +35,7 @@ testfont binary
/lib/modules/Crypto/des_cbc.pike foreign_ident
/lib/modules/Crypto/idea_cbc.pike foreign_ident
/lib/modules/Crypto/rsa.pike foreign_ident
+/lib/modules/Filesystem.pmod/Tar.pmod foreign_ident
/lib/modules/LR.pmod/Grammar_parser.pmod foreign_ident
/lib/modules/LR.pmod/item.pike foreign_ident
/lib/modules/LR.pmod/lr.pike foreign_ident
diff --git a/lib/modules/Filesystem.pmod/Tar.pmod b/lib/modules/Filesystem.pmod/Tar.pmod
index 2c0fbd874e..c89997790f 100644
--- a/lib/modules/Filesystem.pmod/Tar.pmod
+++ b/lib/modules/Filesystem.pmod/Tar.pmod
@@ -1,4 +1,4 @@
-
+// $Id: Tar.pmod,v 1.3 1999/07/24 20:18:10 sigge Exp $
class _Tar // filesystem
{
@@ -224,7 +224,7 @@ class _TarFS
array(string) get_dir(void|string directory,void|string|array globz)
{
- directory=directory?combine_path(wd,directory):wd;
+ directory=combine_path(wd,(directory||""),"");
array f=glob(root+directory+"?*",tar->filenames);
f-=glob(root+directory+"*/*",f); // stay here
--
GitLab