Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
+39 -2
View File
@@ -1,4 +1,8 @@
$NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $
$NetBSD: patch-aw,v 1.4 2015/11/07 21:47:07 dholland Exp $
- Use standard headers.
- Throw out a raft of legacy sgtty/termio logic.
- Don't fail if NAME_MAX is missing.
--- src/unix.c.orig 2000-03-15 22:13:29.000000000 +0000
+++ src/unix.c
@@ -18,7 +22,40 @@ $NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $
#include <time.h>
#include <unistd.h>
#include "icb.h"
@@ -235,7 +238,11 @@ tildexpand (char *s)
@@ -32,32 +35,10 @@ void noecho (void);
#undef stty
#undef gtty
-#if defined(__linux__)
-#include <termios.h>
-#include <sys/ioctl.h>
#define TTYSTRUCT termios
#define stty(fd,buf) tcgetattr((fd), (buf))
#define gtty(fd,buf) tcsetattr((fd), TCSANOW, (buf))
#define SYSV
-#else
-#ifndef SYSV
-
-#ifdef linux
-#include <bsd/sgtty.h>
-#else
-#include <sgtty.h>
-#endif
-
-#define TTYSTRUCT sgttyb
-#define stty(fd,buf) ioctl((fd),TIOCSETN,(buf))
-#define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf))
-#else /* SYSV */
-#include <termio.h>
-#define TTYSTRUCT termio
-#define stty(fd,buf) ioctl((fd),TCSETA,(buf))
-#define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
-#endif /* SYSV */
-#endif /* __linux__ */
char *getlogin();
@@ -235,7 +216,11 @@ tildexpand (char *s)
struct passwd *pw;
char login[17];
char *p = login;