fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 01fe7ea2fbe348460d4c4a8947cde2f759b7100c..2a67d9f874002ca7440d3aac49df3a785262e3bf 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -17,13 +17,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -276,7 +286,7 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) {
  */
 void cmd_regi(char *argbuf) {
        int a,b,c;
-       char *ibuf;
+       char buf[SIZ];
        struct vCard *my_vcard;
 
        char tmpaddr[SIZ];
@@ -300,23 +310,23 @@ void cmd_regi(char *argbuf) {
 
        cprintf("%d Send registration...\n", SEND_LISTING);
        a=0;
-       while (client_gets(&ibuf), strcmp(ibuf,"000")) {
-               if (a==0) vcard_set_prop(my_vcard, "n", ibuf);
-               if (a==1) strcpy(tmpaddr,ibuf);
-               if (a==2) strcpy(tmpcity,ibuf);
-               if (a==3) strcpy(tmpstate,ibuf);
+       while (client_gets(buf), strcmp(buf,"000")) {
+               if (a==0) vcard_set_prop(my_vcard, "n", buf);
+               if (a==1) strcpy(tmpaddr,buf);
+               if (a==2) strcpy(tmpcity,buf);
+               if (a==3) strcpy(tmpstate,buf);
                if (a==4) {
-                       for (c=0; c<strlen(ibuf); ++c) {
-                               if ((ibuf[c]>='0')&&(ibuf[c]<='9')) {
+                       for (c=0; c<strlen(buf); ++c) {
+                               if ((buf[c]>='0')&&(buf[c]<='9')) {
                                        b=strlen(tmpzip);
-                                       tmpzip[b]=ibuf[c];
+                                       tmpzip[b]=buf[c];
                                        tmpzip[b+1]=0;
                                        }
                                }
                        }
-               if (a==5) vcard_set_prop(my_vcard, "tel;home", ibuf);
-               if (a==6) vcard_set_prop(my_vcard, "email;internet", ibuf);
-               if (a==7) strcpy(tmpcountry, ibuf);
+               if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
+               if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
+               if (a==7) strcpy(tmpcountry, buf);
                ++a;
                }
        sprintf(tmpaddress, ";;%s;%s;%s;%s;%s",