diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | openbsd-compat/glob.h | 4 |
2 files changed, 4 insertions, 3 deletions
| @@ -28,6 +28,7 @@ | |||
| 28 | - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18. | 28 | - (dtucker) [openbsd-compat/readpassphrase.c] Update from OpenBSD 1.16 -> 1.18. |
| 29 | - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5. | 29 | - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5. |
| 30 | - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25. | 30 | - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25. |
| 31 | - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9. | ||
| 31 | 32 | ||
| 32 | 20051105 | 33 | 20051105 |
| 33 | - (djm) OpenBSD CVS Sync | 34 | - (djm) OpenBSD CVS Sync |
| @@ -3270,4 +3271,4 @@ | |||
| 3270 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3271 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
| 3271 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3272 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
| 3272 | 3273 | ||
| 3273 | $Id: ChangeLog,v 1.3971 2005/11/10 06:02:21 dtucker Exp $ | 3274 | $Id: ChangeLog,v 1.3972 2005/11/10 06:03:22 dtucker Exp $ |
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h index 5d80073d3..4fdbfc1ea 100644 --- a/openbsd-compat/glob.h +++ b/openbsd-compat/glob.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: glob.h,v 1.8 2003/06/02 19:34:12 millert Exp $ */ | 1 | /* $OpenBSD: glob.h,v 1.9 2004/10/07 16:56:11 millert Exp $ */ |
| 2 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ | 2 | /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| @@ -72,6 +72,7 @@ typedef struct { | |||
| 72 | #define GLOB_MARK 0x0008 /* Append / to matching directories. */ | 72 | #define GLOB_MARK 0x0008 /* Append / to matching directories. */ |
| 73 | #define GLOB_NOCHECK 0x0010 /* Return pattern itself if nothing matches. */ | 73 | #define GLOB_NOCHECK 0x0010 /* Return pattern itself if nothing matches. */ |
| 74 | #define GLOB_NOSORT 0x0020 /* Don't sort. */ | 74 | #define GLOB_NOSORT 0x0020 /* Don't sort. */ |
| 75 | #define GLOB_NOESCAPE 0x1000 /* Disable backslash escaping. */ | ||
| 75 | 76 | ||
| 76 | #define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory funcs. */ | 77 | #define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory funcs. */ |
| 77 | #define GLOB_BRACE 0x0080 /* Expand braces ala csh. */ | 78 | #define GLOB_BRACE 0x0080 /* Expand braces ala csh. */ |
| @@ -79,7 +80,6 @@ typedef struct { | |||
| 79 | #define GLOB_NOMAGIC 0x0200 /* GLOB_NOCHECK without magic chars (csh). */ | 80 | #define GLOB_NOMAGIC 0x0200 /* GLOB_NOCHECK without magic chars (csh). */ |
| 80 | #define GLOB_QUOTE 0x0400 /* Quote special chars with \. */ | 81 | #define GLOB_QUOTE 0x0400 /* Quote special chars with \. */ |
| 81 | #define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ | 82 | #define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ |
| 82 | #define GLOB_NOESCAPE 0x1000 /* Disable backslash escaping. */ | ||
| 83 | #define GLOB_LIMIT 0x2000 /* Limit pattern match output to ARG_MAX */ | 83 | #define GLOB_LIMIT 0x2000 /* Limit pattern match output to ARG_MAX */ |
| 84 | 84 | ||
| 85 | /* Error values returned by glob(3) */ | 85 | /* Error values returned by glob(3) */ |