head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.48 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.46 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.44 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.42 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.40 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.38 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.36 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.34 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.32 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.30 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.28 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.26 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.24 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.22 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.20 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.18 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.16 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2004.09.11.14.56.33; author jmmv; state dead; branches; next 1.1; 1.1 date 2000.08.25.16.15.53; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.08.25.16.15.53; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Remove devel/cmdline: it is unmaintained and does not build with recent versions of GCC 3 (in fact, it already had lots of patches to fix C++ stuff, but still had problems). Ok'ed by jlam@@, who imported it in the first place. Not used by any other package nor anyone else (as seen in tech-pkg@@). @ text @$NetBSD: patch-ay,v 1.1 2000/08/25 16:15:53 jlam Exp $ --- src/lib/cmdline.c.orig Thu Jan 2 13:33:32 1997 +++ src/lib/cmdline.c @@@@ -18,21 +18,31 @@@@ // - Added cmd_nargs_parsed field to CmdLine // - Added cmd_description field to CmdLine // - Added exit_handler() and quit() member-functions to CmdLine +// +// 08/16/00 Johnny Lam +// - Wrapped in namespace cmdline +// - Updated to follow ISO C++ standard //-^^--------------------------------------------------------------------- -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "cmdline.h" #include "cmdargs.h" #include "arglist.h" #include "states.h" -#define va_CmdArgP(ap) va_arg(ap, CmdArg *) +namespace cmdline { +using std::cerr; +using std::exit; +using std::strcpy; +using std::strrchr; + +#define va_CmdArgP(ap) va_arg(ap, CmdArg *) //------------------------------------------------------------------- init_args @@@@ -139,12 +149,12 @@@@ # ifdef vms char * ver; // remove leading directory and/or device name - p1 = ::strrchr(filename, ':'); - p2 = ::strrchr(filename, ']'); + p1 = strrchr(filename, ':'); + p2 = strrchr(filename, ']'); # else // remove leading directory and/or drive name - p1 = ::strrchr(filename, '/'); - p2 = ::strrchr(filename, '\\'); + p1 = strrchr(filename, '/'); + p2 = strrchr(filename, '\\'); # endif if ((p1 == NULL) && (p2 == NULL)) { start = filename ; @@@@ -157,15 +167,15 @@@@ } str = new char[strlen(start) + 1]; - (void) ::strcpy(str, start); + strcpy(str, start); // remove the extension - ext = ::strrchr(str, '.'); + ext = strrchr(str, '.'); if (ext) *ext = '\0' ; # ifdef vms // remove the version - ver = ::strrchr(str, ';'); + ver = strrchr(str, ';'); if (ver) *ver = '\0' ; # endif @@@@ -173,7 +183,7 @@@@ #else - char * p = ::strrchr(filename, '/') ; + char * p = strrchr(filename, '/') ; return (p == NULL) ? filename : (p + 1) ; #endif /* if (vms || msdos || os2) */ @@@@ -197,7 +207,7 @@@@ cmd_quit_handler(NULL) { name(cmdname); - ::init_args(cmd_args); + init_args(cmd_args); } // Constructor with a name and CmdArgs @@@@ -215,7 +225,7 @@@@ cmd_quit_handler(NULL) { name(cmdname); - ::init_args(cmd_args); + init_args(cmd_args); CmdArgListListIter iter(cmd_args); CmdArgList * arg_list = iter(); @@@@ -244,7 +254,7 @@@@ cmd_quit_handler(NULL) { if (cmdarg1 == NULL) return; - ::init_args(cmd_args); + init_args(cmd_args); CmdArgListListIter iter(cmd_args); CmdArgList * arg_list = iter(); @@@@ -259,7 +269,7 @@@@ // Destructor -CmdLine::~CmdLine(void) +CmdLine::~CmdLine() { delete cmd_args; @@@@ -278,14 +288,14 @@@@ #if (defined(vms) || defined(msdos) || defined(os2)) delete [] cmd_name; #endif - cmd_name = ::filebasename((progname) ? progname : unknown_progname); + cmd_name = filebasename((progname) ? progname : unknown_progname); } // Print an error message prefix and return a reference to the // error output stream for this command ostream & -CmdLine::error(unsigned quiet) const +CmdLine::error(unsigned int quiet) const { ostream * os = (cmd_err) ? cmd_err : &cerr ; if (cmd_name && *cmd_name && !quiet) *os << cmd_name << ": " ; @@@@ -310,7 +320,7 @@@@ if (cmd_quit_handler != NULL) { (*cmd_quit_handler)(status); } else { - ::exit(status); + exit(status); } } @@@@ -338,7 +348,7 @@@@ } } -CmdLineCmdArgIter::~CmdLineCmdArgIter(void) +CmdLineCmdArgIter::~CmdLineCmdArgIter() { delete iter; } @@@@ -347,8 +357,9 @@@@ // Returns NULL if we are already at the end of the list. // CmdArg * -CmdLineCmdArgIter::operator()(void) +CmdLineCmdArgIter::operator()() { return (iter) ? iter->operator()() : NULL ; } +} // namespace cmdline @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @cmdline - C++ library for parsing command arguments @ text @@