37 lines
783 B
Text
37 lines
783 B
Text
|
$NetBSD: patch-ad,v 1.1 2005/11/06 11:25:57 leonardschmidt Exp $
|
||
|
|
|
||
|
|
--- src/rcfile.ll.orig 2004-07-31 20:00:59.000000000 +0000
|
||
|
|
+++ src/rcfile.ll
|
||
|
|
@@ -44,7 +44,7 @@
|
||
|
|
|
||
|
|
extern "C"
|
||
|
|
{
|
||
|
|
-#include "wordexp.h"
|
||
|
|
+#include "glob.h"
|
||
|
|
}
|
||
|
|
|
||
|
|
using namespace std;
|
||
|
|
@@ -125,7 +125,7 @@ CTRL_CHAR .
|
||
|
|
|
||
|
|
<INCL>[^ \t\n]+ {
|
||
|
|
/* Include further rcfiles: */
|
||
|
|
- wordexp_t result;
|
||
|
|
+ glob_t result;
|
||
|
|
|
||
|
|
if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
|
||
|
|
{
|
||
|
|
@@ -136,10 +136,10 @@ CTRL_CHAR .
|
||
|
|
|
||
|
|
try
|
||
|
|
{
|
||
|
|
- if (wordexp (yytext, &result, 0) == 0)
|
||
|
|
+ if (glob (yytext, 0, NULL, &result) == 0)
|
||
|
|
{
|
||
|
|
- sub_file = result.we_wordv[0];
|
||
|
|
- wordfree (&result);
|
||
|
|
+ sub_file = result.gl_pathv[0];
|
||
|
|
+ globfree (&result);
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|