Attachment #233 for bug #499

View | Details | Raw Unified | Return to bug 499
Collapse All | Expand All

Lines 383-389 AC_ARG_WITH(libs, Link Here

(-)configure.ac (-2 / +2 lines)
383		383
384	# Checks for header files.	384	# Checks for header files.
385	AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \	385	AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
386	getopt.h glob.h ia.h lastlog.h limits.h login.h \	386	getopt.h glob.h ia.h lastlog.h libgen.h limits.h login.h \
387	login_cap.h maillock.h netdb.h netgroup.h \	387	login_cap.h maillock.h netdb.h netgroup.h \
388	netinet/in_systm.h paths.h pty.h readpassphrase.h \	388	netinet/in_systm.h paths.h pty.h readpassphrase.h \
389	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \	389	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
Lines 610-616 AC_CHECK_FUNCS(arc4random b64_ntop bcopy Link Here
610	realpath recvmsg rresvport_af sendmsg setdtablesize setegid \	610	realpath recvmsg rresvport_af sendmsg setdtablesize setegid \
611	setenv seteuid setgroups setlogin setproctitle setresgid setreuid \	611	setenv seteuid setgroups setlogin setproctitle setresgid setreuid \
612	setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \	612	setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \
613	socketpair strerror strlcat strlcpy strmode strnvis sysconf \	613	socketpair strerror strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
614	truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)	614	truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty)
615		615
616	AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))	616	AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))

Lines 62-68 Link Here

(-)progressmeter.c (+7 lines)
62	#include "includes.h"	62	#include "includes.h"
63	RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $");	63	RCSID("$OpenBSD: progressmeter.c,v 1.2 2003/01/12 16:57:02 markus Exp $");
64		64
		65	#ifdef HAVE_LIBGEN_H
65	#include <libgen.h>	66	#include <libgen.h>
		67	#endif
66		68
67	#include "atomicio.h"	69	#include "atomicio.h"
68	#include "progressmeter.h"	70	#include "progressmeter.h"
Lines 147-154 foregroundproc(void) Link Here
147	if (pgrp == -1)	149	if (pgrp == -1)
148	pgrp = getpgrp();	150	pgrp = getpgrp();
149		151
		152	#ifdef HAVE_TCGETPGRP
		153	return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 &&
		154	ctty_pgrp == pgrp);
		155	#else
150	return ((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 &&	156	return ((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 &&
151	ctty_pgrp == pgrp));	157	ctty_pgrp == pgrp));
		158	#endif
152	}	159	}
153		160
154	static void	161	static void





#include <fcntl.h>
#include <stdlib.h>
#include <sys/cygwin.h>
#include <sys/utsname.h>
#include <sys/vfs.h>
#include <windows.h>


	if (!inited) {
		struct utsname uts;
		char *c;
		
		if (!uname(&uts)) {
			int major_high = 0;

			  GetProcAddress(kerneldll, "RegisterServiceProcess")))
		return;
	RegisterServiceProcess(0, 1);
}

char *basename(char *path)
{
  char posix_path[PATH_MAX];
  char *last_slash;

  cygwin_conv_to_posix_path (path, posix_path);
  last_slash = strrchr (posix_path, '/');
  return last_slash ? last_slash + 1 : posix_path;
}

#endif /* HAVE_CYGWIN */

Lines 43-48 int binary_pipe(int fd[2]); Link Here

(-)openbsd-compat/bsd-cygwin_util.h (+1 lines)
43	int check_nt_auth(int pwd_authenticated, struct passwd *pw);	43	int check_nt_auth(int pwd_authenticated, struct passwd *pw);
44	int check_ntsec(const char *filename);	44	int check_ntsec(const char *filename);
45	void register_9x_service(void);	45	void register_9x_service(void);
		46	char basename(char path);
46		47
47	#define open binary_open	48	#define open binary_open
48	#define pipe binary_pipe	49	#define pipe binary_pipe

Return to bug 499

Lines 37-42 RCSID("$Id: bsd-cygwin_util.c,v 1.9 2002 Link Here

(-)openbsd-compat/bsd-cygwin_util.c (-1 / +11 lines)
37		37
38	#include <fcntl.h>	38	#include <fcntl.h>
39	#include <stdlib.h>	39	#include <stdlib.h>
		40	#include <sys/cygwin.h>
40	#include <sys/utsname.h>	41	#include <sys/utsname.h>
41	#include <sys/vfs.h>	42	#include <sys/vfs.h>
42	#include <windows.h>	43	#include <windows.h>
Lines 91-97 static int has_capability(int what) Link Here
91		92
92	if (!inited) {	93	if (!inited) {
93	struct utsname uts;	94	struct utsname uts;
94	char *c;
95		95
96	if (!uname(&uts)) {	96	if (!uname(&uts)) {
97	int major_high = 0;	97	int major_high = 0;
Lines 225-230 void register_9x_service(void) Link Here
225	GetProcAddress(kerneldll, "RegisterServiceProcess")))	225	GetProcAddress(kerneldll, "RegisterServiceProcess")))
226	return;	226	return;
227	RegisterServiceProcess(0, 1);	227	RegisterServiceProcess(0, 1);
		228	}
		229
		230	char basename(char path)
		231	{
		232	char posix_path[PATH_MAX];
		233	char *last_slash;
		234
		235	cygwin_conv_to_posix_path (path, posix_path);
		236	last_slash = strrchr (posix_path, '/');
		237	return last_slash ? last_slash + 1 : posix_path;
228	}	238	}
229		239
230	#endif /* HAVE_CYGWIN */	240	#endif /* HAVE_CYGWIN */