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-av,v 1.1 2000/08/25 16:15:53 jlam Exp $ --- src/lib/cmdarg.c.orig Thu Jan 2 13:33:32 1997 +++ src/lib/cmdarg.c @@@@ -10,18 +10,26 @@@@ // // 03/01/93 Brad Appleton // - Added arg_sequence field to CmdArg +// +// 08/16/00 Johnny Lam +// - Wrapped in namespace cmdline +// - Updated to follow ISO C++ standard //-^^--------------------------------------------------------------------- -#include -#include -#include -#include +#include +#include +#include +#include #include "cmdline.h" +namespace cmdline { + +using std::cerr; + //---------------------------------------------------------------------- CmdArg -int CmdArg::is_dummy(void) { return 0; } +int CmdArg::is_dummy() { return 0; } // Copy-Constructor CmdArg::CmdArg(const CmdArg & cp) @@@@ -35,8 +43,8 @@@@ arg_description(cp.arg_description) { if (alloc_value_name) { - char * val_name = new char[::strlen(cp.arg_value_name) + 1] ; - ::strcpy((char *)val_name, cp.arg_value_name); + char * val_name = new char[std::strlen(cp.arg_value_name) + 1] ; + std::strcpy((char *)val_name, cp.arg_value_name); arg_value_name = val_name; } } @@@@ -47,7 +55,7 @@@@ const char * keyword, const char * value, const char * description, - unsigned syntax_flags) + unsigned int syntax_flags) : alloc_value_name(0), arg_flags(0), arg_syntax(syntax_flags), @@@@ -66,7 +74,7 @@@@ CmdArg::CmdArg(char optchar, const char * keyword, const char * description, - unsigned syntax_flags) + unsigned int syntax_flags) : alloc_value_name(0), arg_flags(0), arg_syntax(syntax_flags), @@@@ -83,7 +91,7 @@@@ CmdArg::CmdArg(const char * value, const char * description, - unsigned syntax_flags) + unsigned int syntax_flags) : alloc_value_name(0), arg_flags(0), arg_syntax(syntax_flags), @@@@ -100,7 +108,7 @@@@ // Destructor -CmdArg::~CmdArg(void) +CmdArg::~CmdArg() { if (alloc_value_name) delete [] (char *)arg_value_name; } @@@@ -110,7 +118,7 @@@@ // ^FUNCTION: adjust_syntax - adjust command argument syntax // // ^SYNOPSIS: -// CmdArg::adjust_syntax(void) +// CmdArg::adjust_syntax() // // ^PARAMETERS: // None. @@@@ -134,7 +142,7 @@@@ // Follow along in the code ... //-^^---------------- void -CmdArg::adjust_syntax(void) +CmdArg::adjust_syntax() { static const char default_value_name[] = "value" ; @@@@ -207,7 +215,7 @@@@ // ^FUNCTION: parse_description - parse the argument description string // // ^SYNOPSIS: -// CmdLine::parse_description(void) +// CmdLine::parse_description() // // ^PARAMETERS: // None. @@@@ -233,7 +241,7 @@@@ enum { c_HIDDEN = ';', c_OPEN = '[', c_CLOSE = ']', c_LIST = '.' } ; void -CmdArg::parse_description(void) +CmdArg::parse_description() { if (arg_description == NULL) return; while (isspace(*arg_description)) ++arg_description; @@@@ -249,7 +257,7 @@@@ // ^FUNCTION: parse_value - parse the argument value name // // ^SYNOPSIS: -// CmdLine::parse_value(void) +// CmdLine::parse_value() // // ^PARAMETERS: // None. @@@@ -274,7 +282,7 @@@@ // Its kind of hairy so follow along. //-^^---------------- void -CmdArg::parse_value(void) +CmdArg::parse_value() { const char * save_value = arg_value_name; int brace = 0; @@@@ -306,7 +314,7 @@@@ alloc_value_name = 1; int len = (int) (ptr - arg_value_name); char * copied_value = new char[len + 1]; - (void) ::strncpy(copied_value, arg_value_name, len); + std::strncpy(copied_value, arg_value_name, len); copied_value[len] = '\0'; arg_value_name = copied_value; @@@@ -338,7 +346,7 @@@@ } // Not done - we had better see a "..." - if (::strncmp(ptr, "...", 3) != 0) { + if (std::strncmp(ptr, "...", 3) != 0) { cerr << "Error: unexpected token \"" << ptr << "\"." << endl ; ++errors; } else { @@@@ -365,3 +373,5 @@@@ << "\t(error occurred in CmdArg constructor)" << endl ; } } + +} // 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 @@