tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2005/11/28 17:50:12 

[openbsd-compat/glob.c]
     unused arg in internal static API
This commit is contained in:
Damien Miller 2007-10-26 16:13:39 +10:00
parent c77cadbff0
commit 9c51c8d81a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -77,6 +77,9 @@
[regress/sftp-glob.sh regress/test-exec.sh] [regress/sftp-glob.sh regress/test-exec.sh]
remove "echo -E" crap that I added in last commit and use printf(1) for remove "echo -E" crap that I added in last commit and use printf(1) for
cases where we strictly require echo not to reprocess escape characters. cases where we strictly require echo not to reprocess escape characters.
- deraadt@cvs.openbsd.org 2005/11/28 17:50:12
[openbsd-compat/glob.c]
unused arg in internal static API
- (djm) [regress/sftp-cmds.sh] - (djm) [regress/sftp-cmds.sh]
Use more restrictive glob to pick up test files from /bin - some platforms Use more restrictive glob to pick up test files from /bin - some platforms
ship broken symlinks there which could spoil the test. ship broken symlinks there which could spoil the test.
@ -3351,4 +3354,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4778 2007/10/26 05:37:50 djm Exp $ $Id: ChangeLog,v 1.4779 2007/10/26 06:13:39 djm Exp $

12
openbsd-compat/glob.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: glob.c,v 1.25 2005/08/08 08:05:34 espie Exp $ */ /* $OpenBSD: glob.c,v 1.26 2005/11/28 17:50:12 deraadt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -149,7 +149,7 @@ static int glob0(const Char *, glob_t *);
static int glob1(Char *, Char *, glob_t *, size_t *); static int glob1(Char *, Char *, glob_t *, size_t *);
static int glob2(Char *, Char *, Char *, Char *, Char *, Char *, static int glob2(Char *, Char *, Char *, Char *, Char *, Char *,
glob_t *, size_t *); glob_t *, size_t *);
static int glob3(Char *, Char *, Char *, Char *, Char *, Char *, static int glob3(Char *, Char *, Char *, Char *, Char *,
Char *, Char *, glob_t *, size_t *); Char *, Char *, glob_t *, size_t *);
static int globextend(const Char *, glob_t *, size_t *); static int globextend(const Char *, glob_t *, size_t *);
static const Char * static const Char *
@ -571,16 +571,16 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
} else } else
/* Need expansion, recurse. */ /* Need expansion, recurse. */
return(glob3(pathbuf, pathbuf_last, pathend, return(glob3(pathbuf, pathbuf_last, pathend,
pathend_last, pattern, pattern_last, pathend_last, pattern, p, pattern_last,
p, pattern_last, pglob, limitp)); pglob, limitp));
} }
/* NOTREACHED */ /* NOTREACHED */
} }
static int static int
glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
Char *pattern, Char *pattern_last, Char *restpattern, Char *pattern, Char *restpattern, Char *restpattern_last, glob_t *pglob,
Char *restpattern_last, glob_t *pglob, size_t *limitp) size_t *limitp)
{ {
struct dirent *dp; struct dirent *dp;
DIR *dirp; DIR *dirp;