See ChangeLog: Tue Dec 29 14:41:47 CET 1998 Werner Koch

6 files changed, 77 insertions, 65 deletions

diff --git a/util/ChangeLog b/util/ChangeLog
index 2311a3ade..f789bde53 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 29 14:41:47 CET 1998  Werner Koch  <[email protected]>
+
+	* secmem.c: Moved unistd.h out of the #ifdef
+
+	* dotlock.c (make_dotlock): Sun has no SYS_NMLN
+
+	* iobuf.c (iobuf_unget_and_close_temp): Reset .start
+
 Sat Dec 12 18:40:32 CET 1998  Werner Koch  <[email protected]>
 
 	* argparse.c (arg_pars): fixed opts[i] with negative index.
diff --git a/util/argparse.c b/util/argparse.c
index 4810d8700..67c3c8ea1 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -928,7 +928,7 @@ main(int argc, char **argv)
 
     while( ArgParse( &pargs, opts) ) {
 	switch( pargs.r_opt ) {
-	  case -1 : printf( "arg='%s'\n", pargs.r.ret_str); break;
+	  case -1 : printf( "arg=`%s'\n", pargs.r.ret_str); break;
 	  case 'v': opt.verbose++; break;
 	  case 'e': opt.echo++; break;
 	  case 'd': opt.debug++; break;
@@ -947,9 +947,9 @@ main(int argc, char **argv)
     if( opt.debug )
 	printf("  debug=%d\n", opt.debug );
     if( opt.outfile )
-	printf("  outfile='%s'\n", opt.outfile );
+	printf("  outfile=`%s'\n", opt.outfile );
     if( opt.crf )
-	printf("  crffile='%s'\n", opt.crf );
+	printf("  crffile=`%s'\n", opt.crf );
     if( opt.myopt )
 	printf("  myopt=%d\n", opt.myopt );
     if( opt.a_long_one )
diff --git a/util/dotlock.c b/util/dotlock.c
index 794a362f7..69a38d696 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -66,7 +66,10 @@ make_dotlock( const char *file_to_lock, long timeout )
     /* fixme: add the hostname to the second line (FQDN or IP addr?) */
 
     /* create a temporary file */
-  #if SYS_NMLN < 8
+  #if defined(SYS_NMLN) && SYS_NMLN < 8
+    #error Aiiih
+  #elif !defined(SYS_NMLN) && MAXHOSTNAMELEN < 8
+    /* (SunOS uses a structure of size MAXHOSTNAMELEN) */
     #error Aiiih
   #endif
     if( uname( &uts ) )
@@ -96,17 +99,17 @@ make_dotlock( const char *file_to_lock, long timeout )
 			  S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR );
     } while( fd == -1 && errno == EINTR );
     if( fd == -1 ) {
-	log_error( "failed to create temporary file '%s': %s\n",
+	log_error( "failed to create temporary file `%s': %s\n",
 					      tname, strerror(errno));
 	goto leave;
     }
     have_tfile = 1;
     if( write(fd, pidstr, 11 ) != 11 ) {
-	log_fatal( "error writing to '%s': %s\n", tname, strerror(errno) );
+	log_fatal( "error writing to `%s': %s\n", tname, strerror(errno) );
 	goto leave;
     }
     if( close(fd) ) {
-	log_error( "error closing '%s': %s\n", tname, strerror(errno));
+	log_error( "error closing `%s': %s\n", tname, strerror(errno));
 	goto leave;
     }
     fd = -1;
@@ -197,7 +200,7 @@ release_dotlock( const char *lockfile )
 	return -1;
     }
     if( remove( lockfile ) ) {
-	log_error( "release_dotlock: error removing lockfile '%s'",
+	log_error( "release_dotlock: error removing lockfile `%s'",
 							    lockfile);
 	return -1;
     }
@@ -217,12 +220,12 @@ read_lockfile( const char *name )
 
     if( (fd = open(name, O_RDONLY)) == -1 ) {
 	int e = errno;
-	log_debug("error opening lockfile '%s': %s\n", name, strerror(errno) );
+	log_debug("error opening lockfile `%s': %s\n", name, strerror(errno) );
 	errno = e;
 	return -1;
     }
     if( read(fd, pidstr, 10 ) != 10 ) {
-	log_debug("error reading lockfile '%s'", name );
+	log_debug("error reading lockfile `%s'", name );
 	close(fd);
 	errno = 0;
 	return -1;
@@ -230,7 +233,7 @@ read_lockfile( const char *name )
     close(fd);
     pid = atoi(pidstr);
     if( !pid || pid == -1 ) {
-	log_error("invalid pid %d in lockfile '%s'", pid, name );
+	log_error("invalid pid %d in lockfile `%s'", pid, name );
 	errno = 0;
 	return -1;
     }
diff --git a/util/errors.c b/util/errors.c
index acee8f14b..af182f2fd 100644
--- a/util/errors.c
+++ b/util/errors.c
@@ -51,49 +51,49 @@ g10_errstr( int err )
     switch( err ) {
       case -1:		p = "eof"; break;
       case 0:		p = "okay"; break;
-      X(GENERAL,	N_("General error"))
-      X(UNKNOWN_PACKET, N_("Unknown packet type"))
-      X(UNKNOWN_VERSION,N_("Unknown version"))
-      X(PUBKEY_ALGO    ,N_("Unknown pubkey algorithm"))
-      X(DIGEST_ALGO    ,N_("Unknown digest algorithm"))
-      X(BAD_PUBKEY     ,N_("Bad public key"))
-      X(BAD_SECKEY     ,N_("Bad secret key"))
-      X(BAD_SIGN       ,N_("Bad signature"))
-      X(CHECKSUM   ,	N_("Checksum error"))
-      X(BAD_PASS     ,	N_("Bad passphrase"))
-      X(NO_PUBKEY      ,N_("Public key not found"))
-      X(CIPHER_ALGO    ,N_("Unknown cipher algorithm"))
-      X(KEYRING_OPEN   ,N_("Can't open the keyring"))
-      X(INVALID_PACKET ,N_("Invalid packet"))
-      X(INVALID_ARMOR  ,N_("Invalid armor"))
-      X(NO_USER_ID     ,N_("No such user id"))
-      X(NO_SECKEY      ,N_("Secret key not available"))
-      X(WRONG_SECKEY   ,N_("Wrong secret key used"))
-      X(UNSUPPORTED    ,N_("Not supported"))
-      X(BAD_KEY        ,N_("Bad key"))
-      X(READ_FILE      ,N_("File read error"))
-      X(WRITE_FILE     ,N_("File write error"))
-      X(COMPR_ALGO     ,N_("Unknown compress algorithm"))
-      X(OPEN_FILE      ,N_("File open error"))
-      X(CREATE_FILE    ,N_("File create error"))
-      X(PASSPHRASE     ,N_("Invalid passphrase"))
-      X(NI_PUBKEY      ,N_("Unimplemented pubkey algorithm"))
-      X(NI_CIPHER      ,N_("Unimplemented cipher algorithm"))
-      X(SIG_CLASS      ,N_("Unknown signature class"))
-      X(TRUSTDB        ,N_("Trust database error"))
-      X(BAD_MPI        ,N_("Bad MPI"))
-      X(RESOURCE_LIMIT ,N_("Resource limit"))
-      X(INV_KEYRING    ,N_("Invalid keyring"))
-      X(BAD_CERT       ,N_("Bad certificate"))
-      X(INV_USER_ID    ,N_("Malformed user id"))
-      X(CLOSE_FILE     ,N_("File close error"))
-      X(RENAME_FILE    ,N_("File rename error"))
-      X(DELETE_FILE    ,N_("File delete error"))
-      X(UNEXPECTED     ,N_("Unexpected data"))
-      X(TIME_CONFLICT  ,N_("Timestamp conflict"))
-      X(WR_PUBKEY_ALGO ,N_("Unusable pubkey algorithm"))
-      X(FILE_EXISTS    ,N_("File exists"))
-      X(WEAK_KEY       ,N_("Weak key"))
+      X(GENERAL,	N_("general error"))
+      X(UNKNOWN_PACKET, N_("unknown packet type"))
+      X(UNKNOWN_VERSION,N_("unknown version"))
+      X(PUBKEY_ALGO    ,N_("unknown pubkey algorithm"))
+      X(DIGEST_ALGO    ,N_("unknown digest algorithm"))
+      X(BAD_PUBKEY     ,N_("bad public key"))
+      X(BAD_SECKEY     ,N_("bad secret key"))
+      X(BAD_SIGN       ,N_("bad signature"))
+      X(CHECKSUM   ,	N_("checksum error"))
+      X(BAD_PASS     ,	N_("bad passphrase"))
+      X(NO_PUBKEY      ,N_("public key not found"))
+      X(CIPHER_ALGO    ,N_("unknown cipher algorithm"))
+      X(KEYRING_OPEN   ,N_("can't open the keyring"))
+      X(INVALID_PACKET ,N_("invalid packet"))
+      X(INVALID_ARMOR  ,N_("invalid armor"))
+      X(NO_USER_ID     ,N_("no such user id"))
+      X(NO_SECKEY      ,N_("secret key not available"))
+      X(WRONG_SECKEY   ,N_("wrong secret key used"))
+      X(UNSUPPORTED    ,N_("not supported"))
+      X(BAD_KEY        ,N_("bad key"))
+      X(READ_FILE      ,N_("file read error"))
+      X(WRITE_FILE     ,N_("file write error"))
+      X(COMPR_ALGO     ,N_("unknown compress algorithm"))
+      X(OPEN_FILE      ,N_("file open error"))
+      X(CREATE_FILE    ,N_("file create error"))
+      X(PASSPHRASE     ,N_("invalid passphrase"))
+      X(NI_PUBKEY      ,N_("unimplemented pubkey algorithm"))
+      X(NI_CIPHER      ,N_("unimplemented cipher algorithm"))
+      X(SIG_CLASS      ,N_("unknown signature class"))
+      X(TRUSTDB        ,N_("trust database error"))
+      X(BAD_MPI        ,N_("bad MPI"))
+      X(RESOURCE_LIMIT ,N_("resource limit"))
+      X(INV_KEYRING    ,N_("invalid keyring"))
+      X(BAD_CERT       ,N_("bad certificate"))
+      X(INV_USER_ID    ,N_("malformed user id"))
+      X(CLOSE_FILE     ,N_("file close error"))
+      X(RENAME_FILE    ,N_("file rename error"))
+      X(DELETE_FILE    ,N_("file delete error"))
+      X(UNEXPECTED     ,N_("unexpected data"))
+      X(TIME_CONFLICT  ,N_("timestamp conflict"))
+      X(WR_PUBKEY_ALGO ,N_("unusable pubkey algorithm"))
+      X(FILE_EXISTS    ,N_("file exists"))
+      X(WEAK_KEY       ,N_("weak key"))
       default: p = buf; sprintf(buf, "g10err=%d", err); break;
     }
   #undef X
diff --git a/util/iobuf.c b/util/iobuf.c
index 7ed5b722d..25bd154a8 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -444,7 +444,7 @@ iobuf_close( IOBUF a )
 	    log_error("iobuf_flush failed on close: %s\n", g10_errstr(rc));
 
 	if( DBG_IOBUF )
-	    log_debug("iobuf-%d.%d: close '%s'\n", a->no, a->subno, a->desc );
+	    log_debug("iobuf-%d.%d: close `%s'\n", a->no, a->subno, a->desc );
 	if( a->filter && (rc = a->filter(a->filter_ov, IOBUFCTRL_FREE,
 					 a->chain, NULL, &dummy_len)) )
 	    log_error("IOBUFCTRL_FREE failed on close: %s\n", g10_errstr(rc) );
@@ -526,7 +526,7 @@ iobuf_open( const char *fname )
     file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
     file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
     if( DBG_IOBUF )
-	log_debug("iobuf-%d.%d: open '%s'\n", a->no, a->subno, fname );
+	log_debug("iobuf-%d.%d: open `%s'\n", a->no, a->subno, fname );
 
     return a;
 }
@@ -560,7 +560,7 @@ iobuf_create( const char *fname )
     file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
     file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
     if( DBG_IOBUF )
-	log_debug("iobuf-%d.%d: create '%s'\n", a->no, a->subno, a->desc );
+	log_debug("iobuf-%d.%d: create `%s'\n", a->no, a->subno, a->desc );
 
     return a;
 }
@@ -590,7 +590,7 @@ iobuf_append( const char *fname )
     file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
     file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
     if( DBG_IOBUF )
-	log_debug("iobuf-%d.%d: append '%s'\n", a->no, a->subno, a->desc );
+	log_debug("iobuf-%d.%d: append `%s'\n", a->no, a->subno, a->desc );
 
     return a;
 }
@@ -616,7 +616,7 @@ iobuf_openrw( const char *fname )
     file_filter( fcx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
     file_filter( fcx, IOBUFCTRL_INIT, NULL, NULL, &len );
     if( DBG_IOBUF )
-	log_debug("iobuf-%d.%d: openrw '%s'\n", a->no, a->subno, a->desc );
+	log_debug("iobuf-%d.%d: openrw `%s'\n", a->no, a->subno, a->desc );
 
     return a;
 }
@@ -708,9 +708,9 @@ iobuf_push_filter( IOBUF a,
     f( ov, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &dummy_len );
 
     if( DBG_IOBUF ) {
-	log_debug("iobuf-%d.%d: push '%s'\n", a->no, a->subno, a->desc );
+	log_debug("iobuf-%d.%d: push `%s'\n", a->no, a->subno, a->desc );
 	for(b=a; b; b = b->chain )
-	    log_debug("\tchain: %d.%d '%s'\n", b->no, b->subno, b->desc );
+	    log_debug("\tchain: %d.%d `%s'\n", b->no, b->subno, b->desc );
     }
 
     /* now we can initialize the new function if we have one */
@@ -735,7 +735,7 @@ iobuf_pop_filter( IOBUF a, int (*f)(void *opaque, int control,
 	BUG();
 
     if( DBG_IOBUF )
-	log_debug("iobuf-%d.%d: pop '%s'\n", a->no, a->subno, a->desc );
+	log_debug("iobuf-%d.%d: pop `%s'\n", a->no, a->subno, a->desc );
     if( !a->filter ) { /* this is simple */
 	b = a->chain;
 	assert(b);
@@ -872,9 +872,9 @@ iobuf_clear_eof(IOBUF a)
     assert(a->usage == 1);
 
     if( a->filter )
-	log_info("iobuf-%d.%d: clear_eof '%s' with enabled filter\n", a->no, a->subno, a->desc );
+	log_info("iobuf-%d.%d: clear_eof `%s' with enabled filter\n", a->no, a->subno, a->desc );
     if( !a->filter_eof )
-	log_info("iobuf-%d.%d: clear_eof '%s' with no EOF pending\n", a->no, a->subno, a->desc );
+	log_info("iobuf-%d.%d: clear_eof `%s' with no EOF pending\n", a->no, a->subno, a->desc );
     iobuf_pop_filter(a, NULL, NULL);
 }
 
@@ -1104,6 +1104,7 @@ iobuf_unget_and_close_temp( IOBUF a, IOBUF temp )
     a->unget.buf = m_alloc( a->unget.size );
     a->nofast |= 2;
     a->unget.len = temp->d.len;
+    a->unget.start = 0;
     memcpy( a->unget.buf, temp->d.buf, a->unget.len );
     iobuf_close(temp);
 }
diff --git a/util/secmem.c b/util/secmem.c
index ce93a6bf8..30396f3c3 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <unistd.h>
 #if defined(HAVE_MLOCK) || defined(HAVE_MMAP)
-  #include <unistd.h>
   #include <sys/mman.h>
   #include <sys/types.h>
   #include <fcntl.h>