[Mixmaster-devel] CVS: Mix/Src config.h,1.9.2.6,1.9.2.7 mail.c,1.7.2.8,1.7.2.9 mix.c,1.11.2.10,1.11.2.11 mix.h,1.4.2.4,1.4.2.5 mix3.h,1.8.2.5,1.8.2.6 random.c,1.2.2.2,1.2.2.3 util.c,1.2.2.6,1.2.2.7

[Colin T. <co...@us...>]

Update of /cvsroot/mixmaster/Mix/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv21144/Src

Modified Files:
      Tag: mixmaster_2_9_STABLE
	config.h mail.c mix.c mix.h mix3.h random.c util.c 
Log Message:
changes for Windows build

Index: config.h
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/config.h,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -d -r1.9.2.6 -r1.9.2.7
--- config.h	16 Dec 2002 22:38:04 -0000	1.9.2.6
+++ config.h	12 Jan 2003 22:21:26 -0000	1.9.2.7
@@ -130,8 +130,12 @@
 #if defined(WIN32) && !defined(_USRDLL)
 #define DLLIMPORT __declspec(dllimport)
 #else
+#if defined(WIN32) && defined(MIXLIB_EXPORTS)
+#define DLLIMPORT __declspec(dllexport)
+#else
 #define DLLIMPORT
 #endif
+#endif
 
 /** Constants *********************************************************/
 
@@ -196,7 +200,7 @@
 #define DEFAULT_NYMSECRING "nymsec.pgp"
 #define DEFAULT_NYMDB "secrets.mix"
 
-extern char MIXCONF[];
+DLLIMPORT extern char MIXCONF[];
 extern char DISCLAIMFILE[];
 extern char FROMDSCLFILE[];
 extern char MSGFOOTERFILE[];

Index: mail.c
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/mail.c,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -u -d -r1.7.2.8 -r1.7.2.9
--- mail.c	16 Dec 2002 22:38:05 -0000	1.7.2.8
+++ mail.c	12 Jan 2003 22:21:26 -0000	1.7.2.9
@@ -153,7 +153,13 @@
     /* Step 2:  Stat the file.  Wait for ENOENT as a response. */
     for (count = 0;; count++) {
       snprintf(path, PATHMAX, "%s%cout.%lu.%u_%lu.%s,S=%lu.txt",
-	POOLDIR, DIRSEP, time(NULL), getpid(), namecounter++, hostname, head->length + message->length);
+	POOLDIR, DIRSEP, time(NULL),
+ #ifdef POSIX
+	getpid(),
+ #else
+	0,
+#endif
+	namecounter++, hostname, head->length + message->length);
 
       if (stat(path, &statbuf) == 0)
 	errno = EEXIST;

Index: mix.c
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/mix.c,v
retrieving revision 1.11.2.10
retrieving revision 1.11.2.11
diff -u -d -r1.11.2.10 -r1.11.2.11
--- mix.c	16 Dec 2002 22:38:07 -0000	1.11.2.10
+++ mix.c	12 Jan 2003 22:21:26 -0000	1.11.2.11
@@ -788,7 +788,6 @@
 #ifdef WIN32SERVICE
     STARTUPINFO StartupInfo;
     OSVERSIONINFO VersionInfo;
-    DWORD dwsize;
 
     if (issvc != -1)    /* do it only once */
 	return issvc;

Index: mix.h
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/mix.h,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- mix.h	16 Dec 2002 22:38:08 -0000	1.4.2.4
+++ mix.h	12 Jan 2003 22:21:26 -0000	1.4.2.5
@@ -817,19 +817,19 @@
   byte sensitive;
 } BUFFER;
 
-int mix_init(char *);
-void mix_exit(void);
+DllExport int mix_init(char *);
+DllExport void mix_exit(void);
 void rnd_update(byte *b, int n);
 void rnd_initialized(void);
 #ifdef WIN32
 int rnd_mouse(UINT i, WPARAM w, LPARAM l);
 #endif /* WIN32 */
 
-BUFFER *buf_new(void);
-int buf_free(BUFFER *buf);
-int buf_read(BUFFER *message, FILE *infile);
-int buf_write(BUFFER *message, FILE *outfile);
-int buf_write_sync(BUFFER *message, FILE *outfile);
+DllExport BUFFER *buf_new(void);
+DllExport int buf_free(BUFFER *buf);
+DllExport int buf_read(BUFFER *message, FILE *infile);
+DllExport int buf_write(BUFFER *message, FILE *outfile);
+DllExport int buf_write_sync(BUFFER *message, FILE *outfile);
 
 #define MSG_MAIL 1
 #define MSG_POST 2
@@ -837,17 +837,17 @@
 
 extern char MIXDIR[];
 
-int mix_encrypt(int type, BUFFER *message, char *chain, int numcopies,
+DllExport int mix_encrypt(int type, BUFFER *message, char *chain, int numcopies,
 		BUFFER *feedback);
-int mix_decrypt(BUFFER *message);
-int mix_send(void);
+DllExport int mix_decrypt(BUFFER *message);
+DllExport int mix_send(void);
 
 #define FORCE_POOL 1
 #define FORCE_POP3 2
 #define FORCE_DAILY 4
 #define FORCE_MAILIN 8
-int mix_regular(int force);
-int mix_daemon(void);
+DllExport int mix_regular(int force);
+DllExport int mix_daemon(void);
 int process_mailin(void);
 
 #ifdef USE_PGP
@@ -856,11 +856,11 @@
 #define NYM_MODIFY 1
 #define NYM_DELETE 2
 
-int nym_config(int mode, char *nym, char *nymserver, BUFFER *pseudonym,
+DllExport int nym_config(int mode, char *nym, char *nymserver, BUFFER *pseudonym,
 	       char *sendchain, int sendnumcopies, BUFFER *chains,
 	       BUFFER *options);
-int nym_encrypt(BUFFER *msg, char *nym, int type);
-int nym_decrypt(BUFFER *msg, char *nym, BUFFER *log);
+DllExport int nym_encrypt(BUFFER *msg, char *nym, int type);
+DllExport int nym_decrypt(BUFFER *msg, char *nym, BUFFER *log);
 
 #define PGP_SIGN 1
 #define PGP_ENCRYPT 2

Index: mix3.h
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/mix3.h,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -d -r1.8.2.5 -r1.8.2.6
--- mix3.h	16 Dec 2002 22:38:08 -0000	1.8.2.5
+++ mix3.h	12 Jan 2003 22:21:26 -0000	1.8.2.6
@@ -13,6 +13,12 @@
 #define _MIX3_H
 #define COPYRIGHT "Copyright Anonymizer Inc."
 
+#ifdef MIXLIB_EXPORTS
+#define DllExport	__declspec( dllexport )
+#else
+#define DllExport
+#endif
+
 #include "config.h"
 #include "mix.h"
 
@@ -36,70 +42,70 @@
 
 /* Dynamically allocated buffers */
 
-int buf_reset(BUFFER *buffer);
-int buf_clear(BUFFER *buffer);
-int buf_append(BUFFER *buffer, byte *mess, int len);
-int buf_cat(BUFFER *to, BUFFER *from);
-int buf_set(BUFFER *to, BUFFER *from);
-int buf_rest(BUFFER *to, BUFFER *from);
-int buf_appendrnd(BUFFER *to, int n);
-int buf_appendzero(BUFFER *to, int n);
-int buf_setc(BUFFER *buf, byte c);
-int buf_appendc(BUFFER *to, byte b);
-int buf_setrnd(BUFFER *b, int n);
-int buf_setf(BUFFER *buffer, char *fmt, ...);
-int buf_appendf(BUFFER *buffer, char *fmt, ...);
-int buf_sets(BUFFER *buf, char *s);
-int buf_appends(BUFFER *buffer, char *s);
-int buf_nl(BUFFER *buffer);
-int buf_pad(BUFFER *buffer, int size);
-int buf_prepare(BUFFER *buffer, int size);
-int buf_rewind(BUFFER *buffer);
-int buf_getc(BUFFER *buffer);
-void buf_ungetc(BUFFER *buffer);
-int buf_get(BUFFER *buffer, BUFFER *to, int n);
-int buf_getline(BUFFER *buffer, BUFFER *line);
-int buf_chop(BUFFER *b);
-void buf_move(BUFFER *dest, BUFFER *src);
-byte *buf_data(BUFFER *buffer);
-int buf_isheader(BUFFER *buffer);
-int buf_getheader(BUFFER *buffer, BUFFER *field, BUFFER *content);
-int buf_appendheader(BUFFER *buffer, BUFFER *field, BUFFER *contents);
-int buf_lookahead(BUFFER *buffer, BUFFER *line);
-int buf_eq(BUFFER *b1, BUFFER *b2);
-int buf_ieq(BUFFER *b1, BUFFER *b2);
-void buf_cut_out(BUFFER *buffer, BUFFER *cut_out, BUFFER *rest,
+DllExport int buf_reset(BUFFER *buffer);
+DllExport int buf_clear(BUFFER *buffer);
+DllExport int buf_append(BUFFER *buffer, byte *mess, int len);
+DllExport int buf_cat(BUFFER *to, BUFFER *from);
+DllExport int buf_set(BUFFER *to, BUFFER *from);
+DllExport int buf_rest(BUFFER *to, BUFFER *from);
+DllExport int buf_appendrnd(BUFFER *to, int n);
+DllExport int buf_appendzero(BUFFER *to, int n);
+DllExport int buf_setc(BUFFER *buf, byte c);
+DllExport int buf_appendc(BUFFER *to, byte b);
+DllExport int buf_setrnd(BUFFER *b, int n);
+DllExport int buf_setf(BUFFER *buffer, char *fmt, ...);
+DllExport int buf_appendf(BUFFER *buffer, char *fmt, ...);
+DllExport int buf_sets(BUFFER *buf, char *s);
+DllExport int buf_appends(BUFFER *buffer, char *s);
+DllExport int buf_nl(BUFFER *buffer);
+DllExport int buf_pad(BUFFER *buffer, int size);
+DllExport int buf_prepare(BUFFER *buffer, int size);
+DllExport int buf_rewind(BUFFER *buffer);
+DllExport int buf_getc(BUFFER *buffer);
+DllExport void buf_ungetc(BUFFER *buffer);
+DllExport int buf_get(BUFFER *buffer, BUFFER *to, int n);
+DllExport int buf_getline(BUFFER *buffer, BUFFER *line);
+DllExport int buf_chop(BUFFER *b);
+DllExport void buf_move(BUFFER *dest, BUFFER *src);
+DllExport byte *buf_data(BUFFER *buffer);
+DllExport int buf_isheader(BUFFER *buffer);
+DllExport int buf_getheader(BUFFER *buffer, BUFFER *field, BUFFER *content);
+DllExport int buf_appendheader(BUFFER *buffer, BUFFER *field, BUFFER *contents);
+DllExport int buf_lookahead(BUFFER *buffer, BUFFER *line);
+DllExport int buf_eq(BUFFER *b1, BUFFER *b2);
+DllExport int buf_ieq(BUFFER *b1, BUFFER *b2);
+DllExport void buf_cut_out(BUFFER *buffer, BUFFER *cut_out, BUFFER *rest,
 		 int from, int len);
 
-int buf_appendl(BUFFER *b, long l);
-int buf_appendl_lo(BUFFER *b, long l);
-long buf_getl(BUFFER *b);
-long buf_getl_lo(BUFFER *b);
-int buf_appendi(BUFFER *b, int i);
-int buf_appendi_lo(BUFFER *b, int i);
-int buf_geti(BUFFER *b);
-int buf_geti_lo(BUFFER *b);
+DllExport int buf_appendl(BUFFER *b, long l);
+DllExport int buf_appendl_lo(BUFFER *b, long l);
+DllExport long buf_getl(BUFFER *b);
+DllExport long buf_getl_lo(BUFFER *b);
+DllExport int buf_appendi(BUFFER *b, int i);
+DllExport int buf_appendi_lo(BUFFER *b, int i);
+DllExport int buf_geti(BUFFER *b);
+DllExport int buf_geti_lo(BUFFER *b);
 
 /* String comparison */
-int strieq(const char *s1, const char *s2);
-int strileft(const char *string, const char *keyword);
-int striright(const char *string, const char *keyword);
-int strifind(const char *string, const char *keyword);
-
-int streq(const char *s1, const char *s2);
-int strfind(const char *string, const char *keyword);
-int strleft(const char *string, const char *keyword);
-
-void strcatn(char *dest, const char *src, int n);
-
-int bufleft(BUFFER *b, char *k);
-int buffind(BUFFER *b, char *k);
-int bufeq(BUFFER *b, char *k);
-
-int bufileft(BUFFER *b, char *k);
-int bufifind(BUFFER *b, char *k);
-int bufiright(BUFFER *b, char *k);
-int bufieq(BUFFER *b, char *k);
+DllExport int strieq(const char *s1, const char *s2);
+DllExport int strileft(const char *string, const char *keyword);
+DllExport int striright(const char *string, const char *keyword);
+DllExport int strifind(const char *string, const char *keyword);
+
+DllExport int streq(const char *s1, const char *s2);
+DllExport int strfind(const char *string, const char *keyword);
+DllExport int strleft(const char *string, const char *keyword);
+
+DllExport void strcatn(char *dest, const char *src, int n);
+
+DllExport int bufleft(BUFFER *b, char *k);
+DllExport int buffind(BUFFER *b, char *k);
+DllExport int bufeq(BUFFER *b, char *k);
+
+DllExport int bufileft(BUFFER *b, char *k);
+DllExport int bufifind(BUFFER *b, char *k);
+DllExport int bufiright(BUFFER *b, char *k);
+DllExport int bufieq(BUFFER *b, char *k);
 
 /* Utility functions */
 void whoami(char *addr, char *defaultname);
@@ -138,7 +144,7 @@
 int doallow(BUFFER *line, BUFFER *filter);
 int allowmessage(BUFFER *in);
 
-void errlog(int type, char *format,...);
+DllExport void errlog(int type, char *format,...);
 void clienterr(BUFFER *msgbuf, char *err);
 void logmail(char *mailbox, BUFFER *message);
 
@@ -162,7 +168,7 @@
 int get_type(BUFFER *content, BUFFER *type, BUFFER *subtype);
 int mail_encode(BUFFER *in, int encoding);
 int hdr_encode(BUFFER *in, int n);
-int attachfile(BUFFER *message, BUFFER *filename);
+DllExport int attachfile(BUFFER *message, BUFFER *filename);
 int pgpmime_sign(BUFFER *message, BUFFER *uid, BUFFER *pass, char *secring);
 int mime_attach(BUFFER *message, BUFFER *attachment, BUFFER *type);
 void mimedecode(BUFFER *msg);
@@ -202,7 +208,7 @@
 int digest_sha1(BUFFER *b, BUFFER *md);
 int digest_rmd160(BUFFER *b, BUFFER *md);
 
-int keymgt(int force);
+DllExport int keymgt(int force);
 int key(BUFFER *b);
 int adminkey(BUFFER *b);
 
@@ -230,8 +236,8 @@
 int seckeytopub(BUFFER *pub, BUFFER *sec, byte keyid[]);
 
 /* configuration, general remailer functions */
-int mix_configline(char *line);
-int mix_config(void);
+DllExport int mix_configline(char *line);
+DllExport int mix_config(void);
 int mix_initialized(void);
 int mix_daily(void);
 
@@ -239,13 +245,13 @@
 #define INTERMEDIATE 0
 int pool_send(void);
 int pool_read(BUFFER *pool);
-int pool_add(BUFFER *msg, char *type);
+DllExport int pool_add(BUFFER *msg, char *type);
 FILE *pool_new(char *type, char *tmpname, char *path);
 int mix_pool(BUFFER *msg, int type, long latent);
 int pool_packetfile(char *fname, BUFFER *mid, int packetnum);
 void pool_packetexp(void);
 int idexp(void);
-void pop3get(void);
+DllExport void pop3get(void);
 
 typedef struct {  /* added for binary id.log change */
   char id[16];
@@ -272,20 +278,20 @@
 int pgp_signtxt(BUFFER *msg, BUFFER *uid, BUFFER *pass,
 		char *secring, int remail);
 int pgp_isconventional(BUFFER *buf);
-int pgp_mailenc(int mode, BUFFER *msg, char *sigid,
+DllExport int pgp_mailenc(int mode, BUFFER *msg, char *sigid,
 		BUFFER *pass, char *pubring, char *secring);
 int pgp_signhashalgo(BUFFER *algo, BUFFER *userid, char *secring,
 		     BUFFER *pass);
 
 /* menu */
-int menu_initialized;
-void menu_main(void);
-void menu_folder(char command, char *name);
-int menu_getuserpass(BUFFER *p, int mode);
-
-int user_pass(BUFFER *b);
-int user_confirmpass(BUFFER *b);
-void user_delpass(void);
+DllExport int menu_initialized;
+DllExport void menu_main(void);
+DllExport void menu_folder(char command, char *name);
+DllExport int menu_getuserpass(BUFFER *p, int mode);
+
+DllExport int user_pass(BUFFER *b);
+DllExport int user_confirmpass(BUFFER *b);
+DllExport void user_delpass(void);
 
 /* remailer */
 typedef struct {
@@ -320,7 +326,7 @@
 
 #define CHAINMAX 421
 #define MAXREM 100
-int prepare_type2list(BUFFER *out);
+DllExport int prepare_type2list(BUFFER *out);
 int mix2_rlist(REMAILER remailer[]);
 int t1_rlist(REMAILER remailer[]);
 int pgp_rlist(REMAILER remailer[], int n);
@@ -411,8 +417,8 @@
 #endif /* else if not defined(WIN32) && defined(USE_SOCK) */
 
 #ifdef WIN32
-int is_nt_service(void);
-void set_nt_exit_event();
+DllExport int is_nt_service(void);
+DllExport void set_nt_exit_event();
 #endif /* WIN32 */
 
 /* check for memory leaks */

Index: random.c
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/random.c,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- random.c	16 Dec 2002 22:38:10 -0000	1.2.2.2
+++ random.c	12 Jan 2003 22:21:26 -0000	1.2.2.3
@@ -103,7 +103,9 @@
 void rnd_update(byte *seed, int l)
 {
   int fd = -1;
+  #ifdef DEV_URANDOM
   byte b[512];
+  #endif /* DEV_URANDOM */
 
   rnd_time();
   if (seed)

Index: util.c
===================================================================
RCS file: /cvsroot/mixmaster/Mix/Src/util.c,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -d -r1.2.2.6 -r1.2.2.7
--- util.c	16 Dec 2002 22:38:13 -0000	1.2.2.6
+++ util.c	12 Jan 2003 22:21:26 -0000	1.2.2.7
@@ -147,8 +147,7 @@
   return p;
 }
 
-int
-file_to_out(const char *filename)
+int file_to_out(const char *filename)
 {
     int len;
     FILE *fp;
@@ -441,8 +440,10 @@
 static int getuserpass(BUFFER *b, int mode)
 {
   char p[LINELEN];
+#ifdef UNIX
   int fd;
   int n;
+#endif
 
 #ifdef HAVE_TERMIOS
   struct termios attr;