PERFORCE change 66243 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=66243

Change 66243 by sam at sam_ebb on 2004/12/02 07:13:25

	nuke some stuff that doesn't exist on freebsd and fix
	some warnings and it appears to work!

Affected files ...

.. //depot/projects/wifi/sbin/dhclient/bpf.c#2 edit
.. //depot/projects/wifi/sbin/dhclient/dhclient.c#2 edit
.. //depot/projects/wifi/sbin/dhclient/parse.c#2 edit

Differences ...

==== //depot/projects/wifi/sbin/dhclient/bpf.c#2 (text+ko) ====

@@ -220,6 +220,7 @@
 	if (ioctl(info->rfdesc, BIOCSETF, &p) < 0)
 		error("Can't install packet filter program: %m");
 
+#ifdef BIOCSETWF
 	/* Set up the bpf write filter program structure. */
 	p.bf_len = dhcp_bpf_wfilter_len;
 	p.bf_insns = dhcp_bpf_wfilter;
@@ -232,6 +233,7 @@
 
 	if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0)
 		error("Cannot lock bpf");
+#endif
 }
 
 ssize_t

==== //depot/projects/wifi/sbin/dhclient/dhclient.c#2 (text+ko) ====

@@ -56,6 +56,10 @@
 #include "dhcpd.h"
 #include "privsep.h"
 
+#ifndef _PATH_VAREMPTY
+#define	_PATH_VAREMPTY	"/var/empty"
+#endif
+
 #define	PERIOD 0x2e
 #define	hyphenchar(c) ((c) == 0x2d)
 #define	bslashchar(c) ((c) == 0x5c)

==== //depot/projects/wifi/sbin/dhclient/parse.c#2 (text+ko) ====

@@ -437,7 +437,7 @@
 		parse_warn("numeric day of week expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_wday = atoi(val);
 
@@ -447,7 +447,7 @@
 		parse_warn("numeric year expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_year = atoi(val);
 	if (tm.tm_year > 1900)
@@ -459,7 +459,7 @@
 		parse_warn("expected slash separating year from month.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 
 	/* Month... */
@@ -468,7 +468,7 @@
 		parse_warn("numeric month expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_mon = atoi(val) - 1;
 
@@ -478,7 +478,7 @@
 		parse_warn("expected slash separating month from day.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 
 	/* Month... */
@@ -487,7 +487,7 @@
 		parse_warn("numeric day of month expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_mday = atoi(val);
 
@@ -497,7 +497,7 @@
 		parse_warn("numeric hour expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_hour = atoi(val);
 
@@ -507,7 +507,7 @@
 		parse_warn("expected colon separating hour from minute.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 
 	/* Minute... */
@@ -516,7 +516,7 @@
 		parse_warn("numeric minute expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_min = atoi(val);
 
@@ -526,7 +526,7 @@
 		parse_warn("expected colon separating hour from minute.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 
 	/* Minute... */
@@ -535,7 +535,7 @@
 		parse_warn("numeric minute expected.");
 		if (token != SEMI)
 			skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 	tm.tm_sec = atoi(val);
 	tm.tm_isdst = 0;
@@ -548,7 +548,7 @@
 	if (token != SEMI) {
 		parse_warn("semicolon expected.");
 		skip_to_semi(cfile);
-		return (NULL);
+		return (0);
 	}
 
 	/* Guess the time value... */