diff options
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cmndline.h | 7 | ||||
| -rw-r--r-- | apt-pkg/contrib/md5.cc | 19 |
2 files changed, 18 insertions, 8 deletions
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index e611cd637..8f461296f 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cmndline.h,v 1.6 1999/01/18 06:20:07 jgg Exp $ +// $Id: cmndline.h,v 1.7 1999/10/31 06:32:28 jgg Exp $ /* ###################################################################### Command Line Class - Sophisticated command line parser @@ -17,7 +17,7 @@ CommandLine::Args Args[] = {{'q',"quiet","apt::get::quiet",CommandLine::IntLevel}, - {0,0,0,0,0}}; + {0,0,0,0}}; The flags mean, HasArg - Means the argument has a value @@ -34,6 +34,9 @@ ConfigFile - Means this flag should be interprited as the name of a config file to read in at this point in option processing. Implies HasArg. + ArbItem - Means the item is an arbitary configuration string of + the form item=value, where item is passed directly + to the configuration class. The default, if the flags are 0 is to use Boolean ##################################################################### */ diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 381c38753..2beaa1204 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: md5.cc,v 1.5 1999/10/25 04:10:02 jgg Exp $ +// $Id: md5.cc,v 1.6 1999/10/31 06:32:28 jgg Exp $ /* ###################################################################### MD5Sum - MD5 Message Digest Algorithm. @@ -52,14 +52,21 @@ // byteSwap - Swap bytes in a buffer /*{{{*/ // --------------------------------------------------------------------- /* Swap n 32 bit longs in given buffer */ -inline static void byteSwap(uint32_t *buf, unsigned words) +#ifdef WORDS_BIGENDIAN +static void byteSwap(uint8_t *buf, unsigned words) { - do + uint8_t *p = (uint8_t *)buf; + + do { - *buf++ = htonl(*buf); - } - while (--words); + *buf++ = (UINT32)((unsigned)p[3] << 8 | p[2]) << 16 | + ((unsigned)p[1] << 8 | p[0]); + p += 4; + } while (--words); } +#else +#define byteSwap(buf,words) +#endif /*}}}*/ // MD5Transform - Alters an existing MD5 hash /*{{{*/ // --------------------------------------------------------------------- |