head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.120
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.118
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.116
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.114
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.112
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.110
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.108
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.106
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.104
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.102
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.100
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.98
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.96
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.94
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.92
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.90
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.88
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.86
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.84
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.82
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.80
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.78
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.76
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.72
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.52
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.74
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.70
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.68
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.66
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.64
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.62
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.60
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.58
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.56
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.54
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.50
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.48
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.46
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.44
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.42
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.40
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.38
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.36
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.34
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.32
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.30
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.28
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.26
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.24
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.22
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.20
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.18
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.16
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.14
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.12
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.10
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.8
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.4
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2011.05.18.12.28.50;	author is;	state Exp;
branches;
next	1.1;

1.1
date	2011.04.14.21.42.42;	author hans;	state Exp;
branches;
next	;


desc
@@


1.2
log
@-back out HAVE_GETLINE, so that this builds on pre-5.99 NetBSD
-patch replacement getline() to be of type ssize_t, so that this builds
 on NetBSD >=5.99
Problem reported by Matthias Kretschmer and Luca Sironi; first part of
fix by Matthias, too.
@
text
@$NetBSD$

--- sysdep.c.orig	2008-11-19 20:36:12.000000000 +0000
+++ sysdep.c
@@@@ -666,7 +666,7 @@@@ int tun_get_hwaddr(int fd, char *dev, ui
 	}
 	
 	return 0;
-#elif defined(SIOCGIFHWADDR)
+#elif defined(SIOCGIFHWADDR) || defined(SIOCGENADDR)
 	struct ifreq ifr;
 	
 	/* Use a new socket fd! */
@@@@ -677,11 +677,20 @@@@ int tun_get_hwaddr(int fd, char *dev, ui
 	memset(&ifr, 0, sizeof(struct ifreq));
 	strncpy(ifr.ifr_name, dev, IFNAMSIZ);
 	
+#if defined(SIOCGIFHWADDR) && !defined(__sun)
 	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) {
 		return -1;
 	}
 	
 	memcpy(hwaddr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+#endif
+#if defined(SIOCGENADDR)
+	if (ioctl(fd, SIOCGENADDR, &ifr) < 0) {
+		return -1;
+	}
+	
+	memcpy(hwaddr, &ifr.ifr_enaddr, ETH_ALEN);
+#endif
 	
 	return 0;
 #else
@@@@ -751,7 +760,7 @@@@ void error(int status, int errornum, con
 #endif
 
 #ifndef HAVE_GETLINE
-int getline(char **line, size_t * length, FILE * stream)
+ssize_t getline(char **line, size_t * length, FILE * stream)
 {
 	size_t len;
 #ifdef HAVE_FGETLN
@


1.1
log
@Make this work on SunOS.
@
text
@d1 4
a4 2
--- sysdep.c.orig	2008-11-19 21:36:12.000000000 +0100
+++ sysdep.c	2010-01-07 23:30:57.937261239 +0100
d35 9
@