head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.108 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.106 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.104 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.102 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.100 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.98 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.96 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.94 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.92 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.90 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.88 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.86 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.84 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.82 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.80 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.78 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.76 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.74 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.72 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.70 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.68 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.66 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.64 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.60 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.40 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.62 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.58 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.56 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.54 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.52 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.50 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.48 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.46 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.44 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.42 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.38 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.36 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.34 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.32 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.30 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.28 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.26 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.24 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.22 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.20 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.18 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.16 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.14 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.12 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.10 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.8 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.6 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.4 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.2.0.60 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.58 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.56 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.54 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.52 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.50 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.48 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.46 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.44 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.42 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.40 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.38 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.36 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.34 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.32 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.30 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.28 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.26 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.24 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.22 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2012.12.24.03.11.25; author dholland; state Exp; branches; next 1.2; 1.2 date 2005.12.13.21.30.11; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.04.13.21.19.48; author hubertf; state Exp; branches; next ; desc @@ 1.3 log @Don't use "restrict" as an identifier; it's a keyword nowadays. Fixes clang build. @ text @$NetBSD: patch-as,v 1.2 2005/12/13 21:30:11 joerg Exp $ - don't use "restrict" as an identifier, it's a keyword now - ...? (XXX) --- src/main.c.orig 2000-03-15 22:13:28.000000000 +0000 +++ src/main.c @@@@ -2,9 +2,9 @@@@ /* Portions copyright (c) 1990-1993, 1994 Mark J. Reed */ /* For copying and distribution information, see the file COPYING. */ - +#include #include -#include +#include #include #include #include @@@@ -19,6 +19,7 @@@@ static void usage (char *name, int ret); char *optv[] = { "clear", "list", "who", "restricted", "nickname:", "group:", "host:", "port:", "password:", "server:", "N:", "help/", + "lhost:", (char *)NULL }; static void @@@@ -33,6 +34,7 @@@@ fprintf(stderr," -group group\t\tsign o fprintf(stderr," -server name\t\tconnect to server named name.\n"); fprintf(stderr," -host host\t\tconnect to server on host host.\n"); fprintf(stderr," -port port\t\ttry to connect to port port.\n"); +fprintf(stderr," -lhost lhost\t\tconnect from local address lhost.\n"); fprintf(stderr," -list\t\t\tlist known servers, in order.\n"); fprintf(stderr," -clear\t\twipe args from command line.\n"); fprintf(stderr," -who\t\t\tsee who's on; don't sign on.\n"); @@@@ -56,12 +58,14 @@@@ main (int argc, char **argv) static char server[MAX_NICKLEN+1]; static char host[MAX_HOSTLEN+1]; static char pass[MAX_PASSLEN+1]; + static char lhost[MAX_HOSTLEN+1]; mynick = NULL; mygroup = "1"; myserver = NULL; myhost = NULL; myport = DEFAULTPORT; + mylhost = NULL; switcherr=0; while ((s = getswitch(argc, argv, optv)) != NULL) @@@@ -93,8 +97,18 @@@@ main (int argc, char **argv) break; case 'l': - listflg++; - gv.interactive = 0; + switch (s[1]) + { + case 'i': + listflg++; + gv.interactive = 0; + break; + case 'h': + strncpy(lhost,switcharg,MAX_HOSTLEN-1); + lhost[MAX_HOSTLEN-1]='\0'; + mylhost = lhost; + break; + } break; case 'p': @@@@ -228,7 +242,7 @@@@ main (int argc, char **argv) tclinit(); readlineinit(); if (restrictflg && !gv.restricted) - restrict(); + setrestricted(); } /* try to connect to port - if it fails, start server if we are on */ @@@@ -261,14 +275,14 @@@@ main (int argc, char **argv) myport = serverdata->port; } - if (connecttoport(myhost, myport) < 0) + if (connecttoport(myhost, myport, mylhost) < 0) { connected = 0; if (try) { while ((serverdata = getserver())!=NULL) { - if (connecttoport(serverdata->host, serverdata->port) == 0) + if (connecttoport(serverdata->host, serverdata->port, mylhost) == 0) { connected = 1; break; @ 1.2 log @Always include sys/types.h, it is needed on !NetBSD as well. Use dirent.h instead of sys/dir.h, the former is POSIX and the latter gives a warning on DragonFly, which breaks -Werror. Use NAME_MAX if available, fall back to MAXNAMLEN otherwise. @ text @d1 4 a4 1 $NetBSD$ d72 9 @ 1.1 log @ Add a -lhost switch to allow binding to a local address on a multihomed host (i.e. choose with which address to connect to the server). Bump revision to i2cb-6.0_ALPHAnb1. @ text @d3 1 a3 1 --- src/main.c.orig Wed Mar 15 23:13:28 2000 d5 12 @