Update head to match stable 1.0

1 files changed, 191 insertions, 50 deletions

diff --git a/include/util.h b/include/util.h
index 375204e78..1d0e4edd5 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
 /* util.h
- *	Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -17,83 +17,136 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifndef GPG_UTIL_H
-#define GPG_UTIL_H
+#ifndef G10_UTIL_H
+#define G10_UTIL_H
 
-#ifdef _GCRYPT_IN_LIBGCRYPT
-  #error This header should not be used internally by libgcrypt
+#if defined (__MINGW32__) || defined (__CYGWIN32__)
+# include <stdarg.h>
 #endif
 
-#include <stdio.h>
 #include "types.h"
 #include "errors.h"
-#include "../jnlib/mischelp.h"
-#include "../jnlib/stringhelp.h"
-#include "../jnlib/argparse.h"
-#include "../jnlib/dotlock.h"
+#include "types.h"
+#include "mpi.h"
+
 
+typedef struct {
+     int  *argc;	    /* pointer to argc (value subject to change) */
+     char ***argv;	    /* pointer to argv (value subject to change) */
+     unsigned flags;	    /* Global flags (DO NOT CHANGE) */
+     int err;		    /* print error about last option */
+			    /* 1 = warning, 2 = abort */
+     int r_opt; 	    /* return option */
+     int r_type;	    /* type of return value (0 = no argument found)*/
+     union {
+	 int   ret_int;
+	 long  ret_long;
+	 ulong ret_ulong;
+	 char *ret_str;
+     } r;		    /* Return values */
+     struct {
+	 int idx;
+	 int inarg;
+	 int stopped;
+	 const char *last;
+	 void *aliases;
+	 const void *cur_alias;
+     } internal;	    /* DO NOT CHANGE */
+} ARGPARSE_ARGS;
+
+typedef struct {
+    int 	short_opt;
+    const char *long_opt;
+    unsigned flags;
+    const char *description; /* optional option description */
+} ARGPARSE_OPTS;
 
 /*-- logger.c --*/
 void log_set_logfile( const char *name, int fd );
 FILE *log_stream(void);
-void gpg_log_print_prefix(const char *text);
+void g10_log_print_prefix(const char *text);
 void log_set_name( const char *name );
 const char *log_get_name(void);
 void log_set_pid( int pid );
-void log_inc_errorcount(void);
 int  log_get_errorcount( int clear );
-void gpg_log_hexdump( const char *text, const char *buf, size_t len );
+void log_inc_errorcount(void);
+void g10_log_hexdump( const char *text, const char *buf, size_t len );
 
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
-  void gpg_log_bug( const char *fmt, ... )
+#if defined (__riscos__) \
+    || (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ))
+  void g10_log_bug( const char *fmt, ... )
 			    __attribute__ ((noreturn, format (printf,1,2)));
-  void gpg_log_bug0( const char *, int, const char * ) __attribute__ ((noreturn));
-  void gpg_log_fatal( const char *fmt, ... )
+  void g10_log_bug0( const char *, int, const char * ) __attribute__ ((noreturn));
+  void g10_log_fatal( const char *fmt, ... )
 			    __attribute__ ((noreturn, format (printf,1,2)));
-  void gpg_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
-  void gpg_log_info( const char *fmt, ... )  __attribute__ ((format (printf,1,2)));
-  void gpg_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
-  void gpg_log_fatal_f( const char *fname, const char *fmt, ... )
+  void g10_log_error( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
+  void g10_log_info( const char *fmt, ... )  __attribute__ ((format (printf,1,2)));
+  void g10_log_debug( const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
+  void g10_log_fatal_f( const char *fname, const char *fmt, ... )
 			    __attribute__ ((noreturn, format (printf,2,3)));
-  void gpg_log_error_f( const char *fname, const char *fmt, ... )
+  void g10_log_error_f( const char *fname, const char *fmt, ... )
 			    __attribute__ ((format (printf,2,3)));
-  void gpg_log_info_f( const char *fname, const char *fmt, ... )
+  void g10_log_info_f( const char *fname, const char *fmt, ... )
 			    __attribute__ ((format (printf,2,3)));
-  void gpg_log_debug_f( const char *fname,  const char *fmt, ... )
+  void g10_log_debug_f( const char *fname,  const char *fmt, ... )
 			    __attribute__ ((format (printf,2,3)));
-  #define BUG() gpg_log_bug0(  __FILE__ , __LINE__, __FUNCTION__ )
+#ifndef __riscos__
+  #define BUG() g10_log_bug0(  __FILE__ , __LINE__, __FUNCTION__ )
+#else
+  #define BUG() g10_log_bug0(  __FILE__ , __LINE__, __func__ )
+#endif
 #else
-  void gpg_log_bug( const char *fmt, ... );
-  void gpg_log_bug0( const char *, int );
-  void gpg_log_fatal( const char *fmt, ... );
-  void gpg_log_error( const char *fmt, ... );
-  void gpg_log_info( const char *fmt, ... );
-  void gpg_log_debug( const char *fmt, ... );
-  void gpg_log_fatal_f( const char *fname, const char *fmt, ... );
-  void gpg_log_error_f( const char *fname, const char *fmt, ... );
-  void gpg_log_info_f( const char *fname, const char *fmt, ... );
-  void gpg_log_debug_f( const char *fname, const char *fmt, ... );
-  #define BUG() gpg_log_bug0( __FILE__ , __LINE__ )
+  void g10_log_bug( const char *fmt, ... );
+  void g10_log_bug0( const char *, int );
+  void g10_log_fatal( const char *fmt, ... );
+  void g10_log_error( const char *fmt, ... );
+  void g10_log_info( const char *fmt, ... );
+  void g10_log_debug( const char *fmt, ... );
+  void g10_log_fatal_f( const char *fname, const char *fmt, ... );
+  void g10_log_error_f( const char *fname, const char *fmt, ... );
+  void g10_log_info_f( const char *fname, const char *fmt, ... );
+  void g10_log_debug_f( const char *fname, const char *fmt, ... );
+  #define BUG() g10_log_bug0( __FILE__ , __LINE__ )
 #endif
 
-#define log_hexdump gpg_log_hexdump
-#define log_bug     gpg_log_bug
-#define log_bug0    gpg_log_bug0
-#define log_fatal   gpg_log_fatal
-#define log_error   gpg_log_error
-#define log_info    gpg_log_info
-#define log_debug   gpg_log_debug
-#define log_fatal_f gpg_log_fatal_f
-#define log_error_f gpg_log_error_f
-#define log_info_f  gpg_log_info_f
-#define log_debug_f gpg_log_debug_f
+#define log_hexdump g10_log_hexdump
+#define log_bug     g10_log_bug
+#define log_bug0    g10_log_bug0
+#define log_fatal   g10_log_fatal
+#define log_error   g10_log_error
+#define log_info    g10_log_info
+#define log_debug   g10_log_debug
+#define log_fatal_f g10_log_fatal_f
+#define log_error_f g10_log_error_f
+#define log_info_f  g10_log_info_f
+#define log_debug_f g10_log_debug_f
 
 
 /*-- errors.c --*/
-const char * gpg_errstr( int no );
+const char * g10_errstr( int no );
 
+/*-- argparse.c --*/
+int arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
+int optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
+		   ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
+void usage( int level );
+const char *default_strusage( int level );
 
 
+/*-- (main program) --*/
+const char *strusage( int level );
+
+
+/*-- dotlock.c --*/
+struct dotlock_handle;
+typedef struct dotlock_handle *DOTLOCK;
+
+void disable_dotlock(void);
+DOTLOCK create_dotlock( const char *file_to_lock );
+int make_dotlock( DOTLOCK h, long timeout );
+int release_dotlock( DOTLOCK h );
+void remove_lockfiles (void);
+
 /*-- fileutil.c --*/
 char * make_basename(const char *filepath);
 char * make_dirname(const char *filepath);
@@ -101,6 +154,7 @@ char *make_filename( const char *first_part, ... );
 int compare_filenames( const char *a, const char *b );
 const char *print_fname_stdin( const char *s );
 const char *print_fname_stdout( const char *s );
+int  is_file_compressed(const char *s, int *r_status);
 
 
 /*-- miscutil.c --*/
@@ -112,7 +166,9 @@ const char *strtimestamp( u32 stamp ); /* GMT */
 const char *asctimestamp( u32 stamp ); /* localized */
 void print_string( FILE *fp, const byte *p, size_t n, int delim );
 void  print_utf8_string( FILE *fp, const byte *p, size_t n );
+void  print_utf8_string2( FILE *fp, const byte *p, size_t n, int delim);
 char *make_printable_string( const byte *p, size_t n, int delim );
+int answer_is_yes_no_default( const char *s, int def_answer );
 int answer_is_yes( const char *s );
 int answer_is_yes_no_quit( const char *s );
 
@@ -125,13 +181,63 @@ STRLIST append_to_strlist( STRLIST *list, const char *string );
 STRLIST append_to_strlist2( STRLIST *list, const char *string, int is_utf8 );
 STRLIST strlist_prev( STRLIST head, STRLIST node );
 STRLIST strlist_last( STRLIST node );
+char *pop_strlist( STRLIST *list );
+const char *memistr( const char *buf, size_t buflen, const char *sub );
+const char *ascii_memistr( const char *buf, size_t buflen, const char *sub );
+char *mem2str( char *, const void *, size_t);
+char *trim_spaces( char *string );
+unsigned int trim_trailing_chars( byte *line, unsigned int len,
+                                  const char *trimchars);
+unsigned int trim_trailing_ws( byte *line, unsigned len );
+unsigned int check_trailing_chars( const byte *line, unsigned int len,
+                                   const char *trimchars );
+unsigned int check_trailing_ws( const byte *line, unsigned int len );
 int string_count_chr( const char *string, int c );
 int set_native_charset( const char *newset );
 const char* get_native_charset(void);
 char *native_to_utf8( const char *string );
-char *utf8_to_native( const char *string, size_t length );
+char *utf8_to_native( const char *string, size_t length, int delim);
 int  check_utf8_string( const char *string );
 
+int ascii_isupper (int c);
+int ascii_islower (int c);
+int ascii_toupper (int c);
+int ascii_tolower (int c);
+int ascii_strcasecmp( const char *a, const char *b );
+int ascii_memcasecmp( const char *a, const char *b, size_t n );
+
+#ifndef HAVE_STPCPY
+char *stpcpy(char *a,const char *b);
+#endif
+#ifndef HAVE_STRLWR
+char *strlwr(char *a);
+#endif
+#ifndef HAVE_STRSEP
+char *strsep (char **stringp, const char *delim);
+#endif
+#ifndef HAVE_STRCASECMP
+int strcasecmp( const char *, const char *b);
+#endif
+#ifndef HAVE_STRNCASECMP
+int strncasecmp (const char *, const char *b, size_t n);
+#endif
+#ifndef HAVE_STRTOUL
+  #define strtoul(a,b,c)  ((unsigned long)strtol((a),(b),(c)))
+#endif
+#ifndef HAVE_MEMMOVE
+  #define memmove(d, s, n) bcopy((s), (d), (n))
+#endif
+
+#if defined (__MINGW32__) || defined (__CYGWIN32__)
+/*-- w32reg.c --*/
+char *read_w32_registry_string( const char *root,
+				const char *dir, const char *name );
+int write_w32_registry_string(const char *root, const char *dir,
+                              const char *name, const char *value);
+
+/*-- strgutil.c --*/
+int vasprintf ( char **result, const char *format, va_list args);
+#endif
 
 /**** other missing stuff ****/
 #ifndef HAVE_ATEXIT  /* For SunOS */
@@ -143,7 +249,42 @@ int  check_utf8_string( const char *string );
 #endif
 
 /******** some macros ************/
+#ifndef STR
+  #define STR(v) #v
+#endif
+#define STR2(v) STR(v)
 #define DIM(v) (sizeof(v)/sizeof((v)[0]))
 #define DIMof(type,member)   DIM(((type *)0)->member)
 
-#endif /*GPG_UTIL_H*/
+/******* RISC OS stuff ***********/
+#ifdef __riscos__
+/* needed for strcasecmp() */
+#include <strings.h>
+/* needed for filename munging */
+#include <unixlib/local.h>
+/* needed for image file system feature */
+#include <unixlib/features.h>
+void riscos_global_defaults();
+#define RISCOS_GLOBAL_STATICS(a) const char *__dynamic_da_name = (a);
+void riscos_set_filetype(const char *filename, const char *mimetype);
+pid_t riscos_getpid(void);
+int riscos_kill(pid_t pid, int sig);
+int riscos_access(const char *path, int amode);
+int fdopenfile(const char *filename, const int allow_write);
+void close_fds(void);
+int renamefile(const char *old, const char *new);
+char *gstrans(const char *old);
+void not_implemented(const char *feature);
+#ifdef DEBUG
+void dump_fdlist(void);
+void list_openfiles(void);
+#endif
+#ifndef __RISCOS__C__
+  #define getpid riscos_getpid
+  #define kill(a,b) riscos_kill((a),(b))
+  #define access(a,b) riscos_access((a),(b))
+#endif /* !__RISCOS__C__ */
+#endif /* __riscos__ */
+
+#endif /*G10_UTIL_H*/
+