This commit was generated by cvs2svn to compensate for changes in r24, which

included commits to RCS files with non-trunk default branches.
This commit is contained in:
tg 2003-05-21 18:35:58 +00:00
commit 9ff3f0d1fb
3 changed files with 22 additions and 27 deletions

View File

@ -1,7 +1,7 @@
/* $OpenBSD: config.h,v 1.7 2003/02/28 09:45:09 jmc Exp $ */
/* $OpenBSD: config.h,v 1.8 2003/05/16 18:49:46 jsyn Exp $ */
/* config.h. NOT generated automatically. */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
/*
* This file, acconfig.h, which is a part of pdksh (the public domain ksh),
* is placed in the public domain. It comes with no licence, warranty
@ -11,7 +11,6 @@
#ifndef CONFIG_H
#define CONFIG_H
/* Define if on AIX 3.
System headers sometimes define this.
We just want to avoid a redefinition error message. */
@ -25,7 +24,6 @@
/* Define to empty if the keyword does not work. */
/* #undef const */
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef gid_t */
@ -174,6 +172,9 @@
/* Define if opendir() will open non-directory files */
/* #undef OPENDIR_DOES_NONDIR */
/* Define if you have a dup2() function in your C library */
#define HAVE_DUP2 1
/* Define if the pgrp of setpgrp() can't be the pid of a zombie process */
/* #undef NEED_PGRP_SYNC */
@ -192,44 +193,44 @@
/* Define if your OS maps references to /dev/fd/n to file descriptor n */
#define HAVE_DEV_FD 1
/* Default PATH (see comments in configure.in for more details) */
/* Default PATH */
#define DEFAULT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
/* Define if your C library's getwd/getcwd function dumps core in unreadable
* directories. */
/* #undef HPUX_GETWD_BUG */
/* Include ksh features? (see comments in configure.in for more details) */
/* Include ksh features? */
/* #define KSH 1 */
/* Include emacs editing? (see comments in configure.in for more details) */
/* Include emacs editing? */
#define EMACS 1
/* Include vi editing? (see comments in configure.in for more details) */
/* Include vi editing? */
#define VI 1
/* Include job control? (see comments in configure.in for more details) */
/* Include job control? */
#define JOBS 1
/* Include brace-expansion? (see comments in configure.in for more details) */
/* Include brace-expansion? */
#define BRACE_EXPAND 1
/* Include any history? (see comments in configure.in for more details) */
/* Include any history? */
#define HISTORY 1
/* Include complex history? (see comments in configure.in for more details) */
/* Include complex history? */
#define COMPLEX_HISTORY
/* Strict POSIX behaviour? (see comments in configure.in for more details) */
/* Strict POSIX behaviour? */
/* #undef POSIXLY_CORRECT */
/* Specify default $ENV? (see comments in configure.in for more details) */
/* Specify default $ENV? */
/* #undef DEFAULT_ENV */
/* Include shl(1) support? (see comments in configure.in for more details) */
/* Include shl(1) support? */
/* #undef SWTCH */
/* Include game-of-life? (see comments in configure.in for more details) */
/* Include game-of-life? */
/* #undef SILLY */
/* The number of bytes in a int. */

View File

@ -1,4 +1,4 @@
/* $OpenBSD: missing.c,v 1.4 1999/06/15 01:18:35 millert Exp $ */
/* $OpenBSD: missing.c,v 1.5 2003/05/16 18:49:46 jsyn Exp $ */
/*
* Routines which may be missing on some machines
@ -8,7 +8,6 @@
#include "ksh_stat.h"
#include "ksh_dir.h"
#ifndef HAVE_MEMSET
void *
memset(d, c, n)
@ -51,7 +50,6 @@ memmove(d, s, n)
}
#endif /* !HAVE_MEMMOVE && !HAVE_BCOPY */
#ifndef HAVE_STRCASECMP
/*
* Case insensitive string compare routines, same semantics as str[n]cmp()
@ -124,7 +122,6 @@ strncasecmp(s1, s2, n)
}
#endif /* HAVE_STRCASECMP */
#ifndef HAVE_STRSTR
char *
strstr(s, p)
@ -140,8 +137,7 @@ strstr(s, p)
return 0;
}
#endif /* HAVE_STRSTR */
#endif /* !HAVE_STRSTR */
#ifndef HAVE_STRERROR
char *
@ -190,7 +186,6 @@ strerror(err)
}
#endif /* !HAVE_STRERROR */
#ifdef TIMES_BROKEN
# include "ksh_time.h"
# include "ksh_times.h"
@ -292,4 +287,4 @@ dup2(oldd, newd)
return fcntl(oldd, F_DUPFD, newd);
}
#endif /* !HAVE_MEMSET */
#endif /* !HAVE_DUP2 */

View File

@ -1,4 +1,4 @@
/* $OpenBSD: proto.h,v 1.10 2003/04/16 23:11:52 tdeval Exp $ */
/* $OpenBSD: proto.h,v 1.11 2003/05/16 19:58:57 jsyn Exp $ */
/*
* prototypes for PD-KSH
@ -189,7 +189,6 @@ void change_flag ARGS((enum sh_flag f, int what, int newval));
int parse_args ARGS((char **argv, int what, int *setargsp));
int getn ARGS((const char *as, int *ai));
int bi_getn ARGS((const char *as, int *ai));
char * strerror ARGS((int i));
int gmatch ARGS((const char *s, const char *p, int isfile));
int has_globbing ARGS((const char *xp, const char *xpe));
const unsigned char *pat_scan ARGS((const unsigned char *p,