head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.160 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.158 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.156 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.154 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.152 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.150 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.148 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.146 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.144 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.142 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.140 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.138 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.136 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.134 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.132 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.130 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.128 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.126 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.124 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.122 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.120 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.118 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.116 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.112 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.92 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.114 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.110 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.108 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.106 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.104 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.102 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.100 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.98 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.96 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.94 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.90 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.88 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.86 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.84 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.82 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.80 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.78 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.76 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.74 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.72 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.70 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.68 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.66 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.64 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.62 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.60 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.58 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.56 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.54 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.52 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.50 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.48 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.46 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.44 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.42 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.40 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.38 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.36 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.34 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.32 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.30 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.28 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.26 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.24 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.22 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.20 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.18 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.16 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.14 pkgsrc-2008Q1:1.1.0.12 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.10 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.1 date 2006.10.30.03.33.59; author jlam; state Exp; branches; next ; desc @@ 1.1 log @Merge improvements from the version of Taylor UUCP 1.06.1 that exists in NetBSD's src/gnu/libexec/uucp directory. Changes include: * Teaching cu(1) about hardware flow control. * Make cu(1) honor "echocheck" and "binary mode" with respect to inspecting the data stream for newlines. * Make some proper integer casts so as not to break on LP64 platforms. * Teach uucp to substitute for \H with the IP address of the system. * Avoid potential divide-by-zero errors when computing times using serial rates. * Properly initialize some variables. The main difference between this version and the one in NetBSD is the location of uucico, uuconv, and uuxqt -- the vanilla UUCP location is ${PREFIX}/sbin while the NetBSD location is /usr/libexec/uucp. Bump PKGREVISION to 1. @ text @$NetBSD$ --- cu.c.orig 2003-05-29 02:08:45.000000000 -0400 +++ cu.c @@@@ -258,6 +258,8 @@@@ main (argc, argv) enum txonxoffsetting txonxoff = XONXOFF_ON; /* -I: configuration file name. */ const char *zconfig = NULL; + /* -F/-f: Hard/Soft flow control. */ + boolean hflow = TRUE; int iopt; pointer puuconf; int iuuconf; @@@@ -295,7 +297,7 @@@@ main (argc, argv) } } - while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:", + while ((iopt = getopt_long (argc, argv, "a:c:deE:fFhnI:l:op:qs:tvx:z:", asCulongopts, (int *) NULL)) != EOF) { switch (iopt) @@@@ -322,6 +324,16 @@@@ main (argc, argv) zCuvar_escape = optarg; break; + case 'f': + /* No h/w flow control. */ + hflow = FALSE; + break; + + case 'F': + /* Use h/w flow control. */ + hflow = TRUE; + break; + case 'h': /* Local echo. */ fCulocalecho = TRUE; @@@@ -348,6 +360,11 @@@@ main (argc, argv) zport = optarg; break; + case 'q': + /* Quiet file transfers */ + fCuvar_verbose = FALSE; + break; + case 's': /* Speed. */ ibaud = strtol (optarg, (char **) NULL, 10); @@@@ -599,6 +616,8 @@@@ main (argc, argv) sport.uuconf_palloc = NULL; sport.uuconf_u.uuconf_sdirect.uuconf_zdevice = NULL; sport.uuconf_u.uuconf_sdirect.uuconf_ibaud = ibaud; + sport.uuconf_u.uuconf_sdirect.uuconf_fcarrier = FALSE; + sport.uuconf_u.uuconf_sdirect.uuconf_fhardflow = hflow; if (! fconn_init (&sport, &sconn, UUCONF_PORTTYPE_UNKNOWN)) ucuabort (); @@@@ -842,11 +861,14 @@@@ ucuhelp () printf (" -e: Set even parity\n"); printf (" -o: Set odd parity\n"); printf (" --parity={odd,even}: Set parity\n"); + printf (" -f: Use hardware flow control\n"); + printf (" -F: Turn off hardware flow control (default)\n"); printf (" -E,--escape char: Set escape character\n"); printf (" -h,--halfduplex: Echo locally\n"); printf (" --nostop: Turn off XON/XOFF handling\n"); printf (" -t,--mapcr: Map carriage return to carriage return/linefeed\n"); printf (" -n,--prompt: Prompt for phone number\n"); + printf (" -q: Be quiet during file transfers\n"); printf (" -d: Set maximum debugging level\n"); printf (" -x,--debug debug: Set debugging type\n"); #if HAVE_TAYLOR_CONFIG @@@@ -1013,7 +1035,7 @@@@ fcudo_cmd (puuconf, qconn, bcmd) switch (bcmd) { default: - if (! isprint (*zCuvar_escape)) + if (! isprint (BUCHAR (*zCuvar_escape))) sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape)); else { @@@@ -1111,7 +1133,7 @@@@ fcudo_cmd (puuconf, qconn, bcmd) return TRUE; case '?': - if (! isprint (*zCuvar_escape)) + if (! isprint (BUCHAR (*zCuvar_escape))) sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape)); else { @@@@ -1248,7 +1270,7 @@@@ icuunrecogvar (puuconf, argc, argv, pvar { char abescape[5]; - if (! isprint (*zCuvar_escape)) + if (! isprint (BUCHAR (*zCuvar_escape))) sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape)); else { @@@@ -1302,7 +1324,7 @@@@ uculist_vars () { int cchar; - if (! isprint (*z)) + if (! isprint (BUCHAR (*z))) { sprintf (abchar, "\\%03o", BUCHAR (*z)); cchar = 4; @@@@ -1415,7 +1437,7 @@@@ icuunrecogfn (puuconf, argc, argv, pvar, { char abescape[5]; - if (! isprint (*zCuvar_escape)) + if (! isprint (BUCHAR (*zCuvar_escape))) sprintf (abescape, "\\%03o", BUCHAR (*zCuvar_escape)); else { @@@@ -2049,7 +2071,7 @@@@ fcusend_buf (qconn, zbufarg, cbufarg) fnl = FALSE; for (i = 0, zget = zbuf; i < csend; i++, zget++) { - if (isprint (*zget) + if (isprint (BUCHAR (*zget)) || *zget == '\t') *zput++ = *zget; else if (*zget == '\n') @@@@ -2082,8 +2104,10 @@@@ fcusend_buf (qconn, zbufarg, cbufarg) mode. Echo checking of a newline is different from checking of normal characters; when we send a newline we look for *zCuvar_echonl. */ + /* Don't check for newlines unless "echocheck" is on or "binary mode" + is off. From NetBSD PR bin/6834 by Frederick Bruckman. */ if ((fCuvar_echocheck && ! fCuvar_binary) - || (fnl && *zCuvar_echonl != '\0')) + && (fnl && *zCuvar_echonl != '\0')) { long iend; @@@@ -2101,7 +2125,7 @@@@ fcusend_buf (qconn, zbufarg, cbufarg) } else { - if (! fCuvar_echocheck || ! isprint (*zget)) + if (! fCuvar_echocheck || ! isprint (BUCHAR (*zget))) continue; bwant = *zget; } @