tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]

Browse Source 
rename getopt() to BSDgetopt() to keep form conflicting with
	 system getopt().
	 [Makefile.in configure.in] disable filepriv until I can add
	 missing procpriv calls.
This commit is contained in:
Tim Rice 2001-09-17 14:34:33 -07:00
parent c3bd7eccac
commit a4f7ae1a35
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,10 @@
20010917 20010917
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
- (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
rename getopt() to BSDgetopt() to keep form conflicting with
system getopt().
[Makefile.in configure.in] disable filepriv until I can add
missing procpriv calls.
20010916 20010916
- (djm) Workaround XFree breakage in RPM spec file - (djm) Workaround XFree breakage in RPM spec file
@ -6452,4 +6457,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1523 2001/09/17 05:07:23 djm Exp $ $Id: ChangeLog,v 1.1524 2001/09/17 21:34:33 tim Exp $

4
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.184 2001/08/06 22:56:46 mouring Exp $ # $Id: Makefile.in,v 1.185 2001/09/17 21:34:33 tim Exp $
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
@ -202,7 +202,7 @@ install-files:
ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi fi

6
configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.308 2001/09/15 11:31:54 djm Exp $ # $Id: configure.in,v 1.309 2001/09/17 21:34:34 tim Exp $
AC_INIT(ssh.c) AC_INIT(ssh.c)
@ -198,13 +198,13 @@ mips-sony-bsd|mips-sony-newsos4)
*-*-sysv4.2*) *-*-sysv4.2*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
enable_suid_ssh=no # enable_suid_ssh=no
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
;; ;;
*-*-sysv5*) *-*-sysv5*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
enable_suid_ssh=no # enable_suid_ssh=no
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
;; ;;
*-*-sysv*) *-*-sysv*)

3
includes.h
View File

@ -51,6 +51,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#ifdef HAVE_GETOPT_H #ifdef HAVE_GETOPT_H
# include <getopt.h> # include <getopt.h>
#endif #endif
#ifndef HAVE_GETOPT_OPTRESET
#define getopt(ac, av, o) BSDgetopt(ac, av, o)
#endif
#ifdef HAVE_BSTRING_H #ifdef HAVE_BSTRING_H
# include <bstring.h> # include <bstring.h>
#endif #endif

2
openbsd-compat/getopt.c
View File

@ -57,7 +57,7 @@ char *optarg; /* argument associated with option */
* Parse argc/argv argument vector. * Parse argc/argv argument vector.
*/ */
int int
getopt(nargc, nargv, ostr) BSDgetopt(nargc, nargv, ostr)
int nargc; int nargc;
char * const *nargv; char * const *nargv;
const char *ostr; const char *ostr;

4
openbsd-compat/getopt.h
View File

@ -1,4 +1,4 @@
/* $Id: getopt.h,v 1.2 2001/07/14 16:05:55 stevesk Exp $ */ /* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */
#ifndef _GETOPT_H #ifndef _GETOPT_H
#define _GETOPT_H #define _GETOPT_H
@ -7,7 +7,7 @@
#ifndef HAVE_GETOPT_H #ifndef HAVE_GETOPT_H
int getopt(int argc, char * const *argv, const char *opts); int BSDgetopt(int argc, char * const *argv, const char *opts);
#endif #endif