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-at,v 1.1 2000/08/25 16:15:53 jlam Exp $ --- src/lib/argiter.c.orig Thu Jan 2 13:33:31 1997 +++ src/lib/argiter.c @@@@ -7,32 +7,38 @@@@ // // ^HISTORY: // 04/03/92 Brad Appleton Created +// +// 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 { + //-------------------------------------------------------- class CmdLineArgIter -CmdLineArgIter::CmdLineArgIter(void) {} +CmdLineArgIter::CmdLineArgIter() {} -CmdLineArgIter::~CmdLineArgIter(void) {} +CmdLineArgIter::~CmdLineArgIter() {} //----------------------------------------------------------- class CmdArgvIter -CmdArgvIter::~CmdArgvIter(void) {} +CmdArgvIter::~CmdArgvIter() {} const char * -CmdArgvIter::operator()(void) { +CmdArgvIter::operator()() { return ((index != count) && (array[index])) ? array[index++] : 0 ; } int -CmdArgvIter::is_temporary(void) const { return 0; } +CmdArgvIter::is_temporary() const { return 0; } //--------------------------------------------------------- class CmdStrTokIter @@@@ -46,7 +52,7 @@@@ } // Destructor -CmdStrTokIter::~CmdStrTokIter(void) +CmdStrTokIter::~CmdStrTokIter() { delete tokstr; } @@@@ -62,24 +68,24 @@@@ tokstr = NULL; token = NULL; if (tokens) { - // Make a copy of the token-string (because ::strtok() modifies it) + // Make a copy of the token-string (because std::strtok() modifies it) // and get the first token from the string // - tokstr = new char[::strlen(tokens) + 1] ; - (void) ::strcpy(tokstr, tokens); - token = ::strtok(tokstr, seps); + tokstr = new char[std::strlen(tokens) + 1] ; + std::strcpy(tokstr, tokens); + token = std::strtok(tokstr, seps); } } // Iterator function -- operator() - // Just use ::strtok to get the next token from the string + // Just use std::strtok to get the next token from the string // const char * -CmdStrTokIter::operator()(void) +CmdStrTokIter::operator()() { if (seps == NULL) seps = WHITESPACE ; const char * result = token; - if (token) token = ::strtok(NULL, seps); + if (token) token = std::strtok(NULL, seps); return result; } @@@@ -87,7 +93,7 @@@@ // always points to temporary space. // int -CmdStrTokIter::is_temporary(void) const +CmdStrTokIter::is_temporary() const { return 1; } @@@@ -102,7 +108,7 @@@@ } // Destructor -CmdIstreamIter::~CmdIstreamIter(void) +CmdIstreamIter::~CmdIstreamIter() { delete tok_iter; } @@@@ -122,7 +128,7 @@@@ // consider the line to be a comment and we ignore it. // const char * -CmdIstreamIter::operator()(void) +CmdIstreamIter::operator()() { const char * result = NULL; if (tok_iter) result = tok_iter->operator()(); @@@@ -151,7 +157,9 @@@@ // the tokens we return are always in temporary storage // int -CmdIstreamIter::is_temporary(void) const +CmdIstreamIter::is_temporary() const { return 1; } + +} // 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 @@