From owner-cvs-all@FreeBSD.ORG Thu Apr 10 22:43:46 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 933331065674; Thu, 10 Apr 2008 22:43:46 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 870878FC17; Thu, 10 Apr 2008 22:43:46 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3AMhkat047959; Thu, 10 Apr 2008 22:43:46 GMT (envelope-from delphij@repoman.freebsd.org) Received: (from delphij@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3AMhkh5047958; Thu, 10 Apr 2008 22:43:46 GMT (envelope-from delphij) Message-Id: <200804102243.m3AMhkh5047958@repoman.freebsd.org> From: Xin LI Date: Thu, 10 Apr 2008 22:43:46 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/usr.bin/chat chat.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2008 22:43:46 -0000 delphij 2008-04-10 22:43:46 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) usr.bin/chat chat.c Log: MFC revision 1.22 date: 2008/03/07 00:01:19; author: delphij; state: Exp; lines: +61 -68 Merge revisions 1.10 and 1.11 from DragonFly: - Use real getopt() handling instead of the hand-rolled and IOCCC-worthy "Micro getopt()" macros, plus clean up to the option handling code: * Sort the options in the switch statement; * Plug piddling memory leaks when processing repeated options by freeing strings before allocating them for a second time; * Die with a fatal error if the requested report file cannot be opened for appending; * Don't call init() before usage() (to prevent the usage message being mangled by changes to the terminal settings;) - Clean up the usage message, both in usage() and in the main program comment, both stylistically (sort and combine options) and for accuracy (following the manual page, make note of the -s and -S flags, and use the term 'send' instead of 'say' to reduce confusion (SAY is the name of a command for output to the user, not the connection.)) Obtained from: DragonFly Revision Changes Path 1.21.10.1 +61 -68 src/usr.bin/chat/chat.c