From owner-freebsd-bugs@FreeBSD.ORG Thu Mar 16 15:10:21 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BB8A16A537 for ; Thu, 16 Mar 2006 15:10:21 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E17B43D9E for ; Thu, 16 Mar 2006 15:09:48 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2GF9fpW082299 for ; Thu, 16 Mar 2006 15:09:41 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2GF9fo3082298; Thu, 16 Mar 2006 15:09:41 GMT (envelope-from gnats) Resent-Date: Thu, 16 Mar 2006 15:09:41 GMT Resent-Message-Id: <200603161509.k2GF9fo3082298@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Volker Stolz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60C4D16A401 for ; Thu, 16 Mar 2006 11:04:39 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B12243D90 for ; Thu, 16 Mar 2006 11:04:33 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k2GB4XE6036699 for ; Thu, 16 Mar 2006 11:04:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k2GB4Xqg036698; Thu, 16 Mar 2006 11:04:33 GMT (envelope-from nobody) Message-Id: <200603161104.k2GB4Xqg036698@www.freebsd.org> Date: Thu, 16 Mar 2006 11:04:33 GMT From: Volker Stolz To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: bin/94548: [PATH] Make telnet accept host:port on the command line X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Mar 2006 15:10:21 -0000 >Number: 94548 >Category: bin >Synopsis: [PATH] Make telnet accept host:port on the command line >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 16 15:09:41 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: 6.1 >Organization: FreeBSD.org >Environment: FreeBSD menelaos.informatik.rwth-aachen.de 6.1-BETA3 FreeBSD 6.1-BETA3 #1: Mon Mar 13 10:45:03 CET 2006 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: This patch makes telnet accept 'host:port' from the command line and handles error cases gracefully. In case the formatting of the patch gets eaten, it is also available from http://i2.foldr.org/~stolz/FreeBSD/telnet.patch >How-To-Repeat: >Fix: --- /usr/src/contrib/telnet/telnet/commands.c Mon Feb 28 13:46:52 2005 +++ src/telnet/telnet/commands.c Thu Mar 16 10:52:06 2006 @@ -2291,8 +2291,26 @@ hostname++; srcroute = 1; } - } else - hostname = hostp; + } else { + char *colon; + /* Did we get host:port? */ + colon = strrchr(hostp,':'); + /* Maybe, make sure it's not an IPv6 address */ + if ((colon != NULL) && (colon == strchr(hostp,':'))) { + if (portp) { + fprintf(stderr, "Destination port already set.\n"); + goto fail; + } else { /* Patch \0 into argument */ + *colon = '\0'; + /* Check if colon was last char in argument: */ + colon++; + if ((*colon) != '\0') + portp = colon; + } + } + hostname = hostp; + + } if (!portp) { telnetport = 1; portp = strdup("telnet"); >Release-Note: >Audit-Trail: >Unformatted: