Tru64 Changes, from Burkhard Schmidt.

diff --git a/configure.in b/configure.in
index 8d36b498f2a50b4f319f75ace3d211661f8fc972..4167bbe5cfb2e758f0fd491c93759f2d0df240f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.16 2004-01-13 12:38:20 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.17 2004-02-07 19:46:07 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -761,6 +761,8 @@ if test x"$this_os" = "xtru64"; then
        AC_DEFINE(USE_OLD_RQUOTA, 1, [Define to use old rquota])
        dnl AC_DEFINE(USE_UFS_QUOTA_H)
        AC_DEFINE(TRU64, 1, [Define on Tru64 platforms])
+       AC_DEFINE(_OSF_SOURCE, 1, [Define if the *passwd UAMs should be used])
+       AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Define for Berkeley DB 4])
        AC_CHECK_LIB(security,set_auth_parameters)
        CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
        need_dash_r=no

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index ea58409cc3b3a2a7563b284cc5e48024e7fbb478..6f20c8a1674c3be26a3cddb6acbfc99b1ef34f54 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.92.2.2.2.11 2004-02-06 13:39:51 bfernhomberg Exp $
+ * $Id: file.c,v 1.92.2.2.2.12 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -101,7 +101,7 @@ void *get_finderinfo(const char *mpath, struct adouble *adp, void *data)
                && (em = getextmap( mpath ))
     ) {
         memcpy(data, em->em_type, sizeof( em->em_type ));
-        memcpy(data + 4, em->em_creator, sizeof(em->em_creator));
+        memcpy((char *)data + 4, em->em_creator, sizeof(em->em_creator));
     }
     return data;
 }

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index c488ada0ddcfeca029953c8f15d2a060d7c013f5..69ce0bc74817efc176d59d7070c436d0ac45fcaa 100644 (file)
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_metad.c,v 1.1.4.11 2004-01-09 21:05:50 lenneis Exp $
+ * $Id: cnid_metad.c,v 1.1.4.12 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -132,9 +132,11 @@ static int send_cred(int socket, int fd)
    struct msghdr msgh; 
    struct iovec iov[1];
    struct cmsghdr *cmsgp = NULL;
-   char buf[CMSG_SPACE(sizeof fd)];
+   char *buf;
    int er=0;
 
+   buf = malloc(CMSG_SPACE(sizeof fd));
+
    memset(&msgh,0,sizeof (msgh));
    memset(buf,0,sizeof (buf));
 
@@ -163,8 +165,10 @@ static int send_cred(int socket, int fd)
    } while ( ret == -1 && errno == EINTR );
    if (ret == -1) {
        LOG(log_error, logtype_cnid, "error in sendmsg: %s", strerror(errno));
+       free(buf);
        return -1;
    }
+   free(buf);
    return 0;
 }
 

diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c
index f34f20ea1e2fa11c0ffdd24d010bc6ab3624ac4f..c95e9fa7fb81be5010d56e00a1cc7312271d59bf 100644 (file)
--- a/etc/cnid_dbd/dbd_add.c
+++ b/etc/cnid_dbd/dbd_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_add.c,v 1.1.4.6 2004-01-21 21:28:42 lenneis Exp $
+ * $Id: dbd_add.c,v 1.1.4.7 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -67,7 +67,7 @@ static int add_cnid(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
         case -1:
            /* FIXME: Should that not be logged for case 1:? */
             LOG(log_error, logtype_cnid, "add_cnid: duplicate %x %s", rply->cnid
-             , data.data + CNID_NAME_OFS);
+             , (char *)data.data + CNID_NAME_OFS);
             
             rqst->cnid = rply->cnid;
             rc = dbd_update(rqst, rply);

diff --git a/etc/cnid_dbd/dbd_getstamp.c b/etc/cnid_dbd/dbd_getstamp.c
index b8f1dab6916aa8979a72e008e297ad552cedf04c..460e0ce52ec90334720994b0c31a50ba30bb558e 100644 (file)
--- a/etc/cnid_dbd/dbd_getstamp.c
+++ b/etc/cnid_dbd/dbd_getstamp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_getstamp.c,v 1.1.2.2 2004-01-09 21:05:50 lenneis Exp $
+ * $Id: dbd_getstamp.c,v 1.1.2.3 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -48,7 +48,7 @@ int dbd_getstamp(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
     }
     
     rply->namelen = CNID_DEV_LEN;
-    rply->name = data.data + CNID_DEV_OFS;    
+    rply->name = (char *)data.data + CNID_DEV_OFS;
     
 #ifdef DEBUG
     LOG(log_info, logtype_cnid, "cnid_getstamp: Returning stamp");

diff --git a/etc/cnid_dbd/dbd_lookup.c b/etc/cnid_dbd/dbd_lookup.c
index f17efba2e9517b10962299e381ea1b145aeb3da5..8b2380656d4e0590e8f4c6c5ed69f64748d8c771 100644 (file)
--- a/etc/cnid_dbd/dbd_lookup.c
+++ b/etc/cnid_dbd/dbd_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_lookup.c,v 1.1.4.6 2004-01-21 21:28:42 lenneis Exp $
+ * $Id: dbd_lookup.c,v 1.1.4.7 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -69,7 +69,7 @@ int dbd_lookup(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
     }
     else {
         memcpy(&id_devino, devdata.data, sizeof(rply->cnid));
-        memcpy(&type_devino, devdata.data +CNID_TYPE_OFS, sizeof(type_devino));
+        memcpy(&type_devino, (char *)devdata.data +CNID_TYPE_OFS, sizeof(type_devino));
         type_devino = ntohl(type_devino);
     }
     
@@ -89,7 +89,7 @@ int dbd_lookup(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
     }
     else {
         memcpy(&id_didname, diddata.data, sizeof(rply->cnid));
-        memcpy(&type_didname, diddata.data +CNID_TYPE_OFS, sizeof(type_didname));
+        memcpy(&type_didname, (char *)diddata.data +CNID_TYPE_OFS, sizeof(type_didname));
         type_didname = ntohl(type_didname);
     }
     

diff --git a/etc/cnid_dbd/dbd_resolve.c b/etc/cnid_dbd/dbd_resolve.c
index 309c4b8d5b42ebcfe7d0219db7011064edec5fb9..802a1b79f6f98c0115766e92343bd2ac663331be 100644 (file)
--- a/etc/cnid_dbd/dbd_resolve.c
+++ b/etc/cnid_dbd/dbd_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_resolve.c,v 1.1.4.6 2004-01-21 21:28:42 lenneis Exp $
+ * $Id: dbd_resolve.c,v 1.1.4.7 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -52,7 +52,7 @@ int dbd_resolve(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
     memcpy(&rply->did, (char *) data.data + CNID_DID_OFS, sizeof(cnid_t));
 
     rply->namelen = data.size - CNID_NAME_OFS;
-    rply->name = data.data + CNID_NAME_OFS;
+    rply->name = (char *)data.data + CNID_NAME_OFS;
 
 #ifdef DEBUG
     LOG(log_info, logtype_cnid, "dbd_resolve: Resolving CNID %u to did %u name %s",

diff --git a/etc/cnid_dbd/pack.c b/etc/cnid_dbd/pack.c
index d7da431df5f28ab5cd0057daeb0a9c49f3b8e048..a4ebcd75456150c25a6447b7ee36cd830e02e928 100644 (file)
--- a/etc/cnid_dbd/pack.c
+++ b/etc/cnid_dbd/pack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.c,v 1.1.4.8 2004-01-21 21:28:42 lenneis Exp $
+ * $Id: pack.c,v 1.1.4.9 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -9,6 +9,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <netatalk/endian.h>
+
 #include <string.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -18,7 +20,6 @@
 #include <db.h>
 
 #include <atalk/cnid_dbd_private.h>
-#include <netatalk/endian.h>
 #include "pack.h"
 
 #ifdef DEBUG
@@ -63,11 +64,11 @@ DBT *skey;
 int len;
  
     memset(skey, 0, sizeof(DBT));
-    skey->data = pdata->data + CNID_DID_OFS;
+    skey->data = (char *)pdata->data + CNID_DID_OFS;
     /* FIXME: At least DB 4.0.14 and 4.1.25 pass in the correct length of
        pdata.size. strlen is therefore not needed. Also, skey should be zeroed
        out already. */
-    len = strlen(skey->data + CNID_DID_LEN);
+    len = strlen((char *)skey->data + CNID_DID_LEN);
     skey->size = CNID_DID_LEN + len + 1;
     return (0);
 }
@@ -79,7 +80,7 @@ const DBT *pkey, *pdata;
 DBT *skey;
 {
     memset(skey, 0, sizeof(DBT));
-    skey->data = pdata->data + CNID_DEVINO_OFS;
+    skey->data = (char *)pdata->data + CNID_DEVINO_OFS;
     skey->size = CNID_DEVINO_LEN;
     return (0);
 }

diff --git a/etc/cnid_dbd/usockfd.h b/etc/cnid_dbd/usockfd.h
index dd1b952bb01e7325d51f359d5961c9d967d8fb70..db9f63f74669e697fea78cb56e2863a6dec8f9aa 100644 (file)
--- a/etc/cnid_dbd/usockfd.h
+++ b/etc/cnid_dbd/usockfd.h
@@ -1,5 +1,5 @@
 /*
- * $Id: usockfd.h,v 1.1.4.3 2004-01-09 21:05:50 lenneis Exp $
+ * $Id: usockfd.h,v 1.1.4.4 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -21,6 +21,9 @@ extern int      usockfd_check   __P((int, unsigned long));
 #define OSSH_ALIGNBYTES (sizeof(int) - 1)
 #endif
 #ifndef __CMSG_ALIGN
+#ifndef u_int
+#define u_int unsigned int
+#endif
 #define __CMSG_ALIGN(p) (((u_int)(p) + OSSH_ALIGNBYTES) &~ OSSH_ALIGNBYTES)
 #endif
 

diff --git a/etc/papd/session.c b/etc/papd/session.c
index 62b21a8e893390824ade86ee3d32e3db0241bccf..7f563bff18cfadca31290614d020db1e7feca892 100644 (file)
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.14 2002-09-29 23:29:14 sibaz Exp $
+ * $Id: session.c,v 1.14.8.1 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -243,7 +243,7 @@ int session( atp, sat )
 
            for ( i = 0; i < atpb.atp_rresiovcnt; i++ ) {
                append( &infile,
-                       niov[ i ].iov_base + 4, niov[ i ].iov_len - 4 );
+                       (char *)niov[ i ].iov_base + 4, niov[ i ].iov_len - 4 );
                if (( infile.pf_state & PF_EOF ) == 0 &&
                        ((char *)niov[ 0 ].iov_base)[ 2 ] ) {
                    infile.pf_state |= PF_EOF;
@@ -304,7 +304,7 @@ int session( atp, sat )
                }
 
                niov[ i ].iov_len = 4 + cc;
-               memcpy( niov[ i ].iov_base + 4, outfile.pf_data, cc );
+               memcpy( (char *)niov[ i ].iov_base + 4, outfile.pf_data, cc );
                CONSUME( &outfile, cc );
                if ( outfile.pf_datalen == 0 ) {
                    i++;

diff --git a/etc/uams/uams_dhx_passwd.c b/etc/uams/uams_dhx_passwd.c
index afca171c66b6c231fa5abf0511179a2ade3e6ff1..b2a706a608797022eb4d75ae2c47593ced1d13f9 100644 (file)
--- a/etc/uams/uams_dhx_passwd.c
+++ b/etc/uams/uams_dhx_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_passwd.c,v 1.18.6.4 2003-10-30 06:43:44 bfernhomberg Exp $
+ * $Id: uams_dhx_passwd.c,v 1.18.6.5 2004-02-07 19:46:08 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -85,8 +85,10 @@ static int pwd_login(void *obj, char *username, int ulen, struct passwd **uam_pw
     DH *dh;
 
 #ifdef TRU64
-    static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-    RAND_seed(rnd_seed, sizeof rnd_seed);
+    int rnd_seed[256];
+    for (i = 0; i < 256; i++)
+        rnd_seed[i] = random();
+    RAND_seed(rnd_seed, sizeof(rnd_seed));
 #endif /* TRU64 */
 
     *rbuflen = 0;

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 596ce9608e2c29b61c3f97744df24d8243c2a4aa..dbf222bb612b9bac5500807fea7f7841076dadd4 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.21.6.7 2004-02-06 13:39:52 bfernhomberg Exp $
+ * $Id: adouble.h,v 1.21.6.8 2004-02-07 19:46:08 didg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -52,8 +52,10 @@
 #endif
 
 #ifdef  HAVE_PREAD
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 500
 #endif
+#endif
 
 #ifdef HAVE_UNISTD_H
 #undef __USE_MISC
@@ -363,6 +365,9 @@ extern int ad_stat    __P((const char *, struct stat *));
 /* extend header to RW if R or W (W if R for locking),
  */ 
 #ifndef ATACC
+#ifndef __inline__
+#define __inline__
+#endif
 static __inline__ mode_t ad_hf_mode (mode_t mode)
 {
     /* fnctl lock need write access */

diff --git a/include/atalk/list.h b/include/atalk/list.h
index f15f676575b8cae49cb12f9a873a3a89aa9bb638..82518ebdbf8ba8fe727f5e7f625cfbdf6ee72dde 100644 (file)
--- a/include/atalk/list.h
+++ b/include/atalk/list.h
@@ -3,6 +3,12 @@
 
 #ifndef _ATALK_LIST_H
 #define _ATALK_LIST_H
+
+/* test for inline */
+#ifndef __inline__
+#define __inline__
+#endif
+
 /*
  * Simple doubly linked list implementation.
  *

diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index a56d52925d8ed9c7ce248868f8e5cbd73c8a376f..4009925a9f68da2a65167ece1fa3dd82d57ee0a1 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_lookup.c
+++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_lookup.c,v 1.1.4.4 2003-11-25 19:13:27 lenneis Exp $
+ * $Id: cnid_cdb_lookup.c,v 1.1.4.5 2004-02-07 19:46:09 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +63,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
     }
     else {
         memcpy(&id_devino, devdata.data, sizeof(cnid_t));
-        memcpy(&type_devino, devdata.data +CNID_TYPE_OFS, sizeof(type_devino));
+        memcpy(&type_devino, (char *)devdata.data +CNID_TYPE_OFS, sizeof(type_devino));
         type_devino = ntohl(type_devino);
     }
 
@@ -81,7 +81,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
     }
     else {
         memcpy(&id_didname, diddata.data, sizeof(cnid_t));
-        memcpy(&type_didname, diddata.data +CNID_TYPE_OFS, sizeof(type_didname));
+        memcpy(&type_didname, (char *)diddata.data +CNID_TYPE_OFS, sizeof(type_didname));
         type_didname = ntohl(type_didname);
     }
 

diff --git a/libatalk/cnid/cdb/cnid_cdb_open.c b/libatalk/cnid/cdb/cnid_cdb_open.c
index e6fd1e8b2aec9d6a4ac46ddb1b9d69b72adc5d7a..dc76f497c097f6e7d17ab9f8334e3a68cbafac6d 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_open.c
+++ b/libatalk/cnid/cdb/cnid_cdb_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_cdb_open.c,v 1.1.4.7 2004-01-15 19:18:27 lenneis Exp $
+ * $Id: cnid_cdb_open.c,v 1.1.4.8 2004-02-07 19:46:09 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -93,8 +93,8 @@ DBT *skey;
 int len;
  
     memset(skey, 0, sizeof(DBT));
-    skey->data = pdata->data + CNID_DID_OFS;
-    len = strlen(skey->data + CNID_DID_LEN);
+    skey->data = (char *)pdata->data + CNID_DID_OFS;
+    len = strlen((char *)skey->data + CNID_DID_LEN);
     skey->size = CNID_DID_LEN + len + 1;
     return (0);
 }
@@ -106,7 +106,7 @@ const DBT *pkey, *pdata;
 DBT *skey;
 {
     memset(skey, 0, sizeof(DBT));
-    skey->data = pdata->data + CNID_DEVINO_OFS;
+    skey->data = (char *)pdata->data + CNID_DEVINO_OFS;
     skey->size = CNID_DEVINO_LEN;
     return (0);
 }

diff --git a/libatalk/cnid/cdb/cnid_cdb_private.h b/libatalk/cnid/cdb/cnid_cdb_private.h
index add37527d293c2e7241e877b8139056b6dde8faf..db83f3dcf87e6a10a2c3c3e0ff16ace251946814 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_private.h
+++ b/libatalk/cnid/cdb/cnid_cdb_private.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_private.h,v 1.1.4.5 2003-12-03 14:56:12 lenneis Exp $
+ * $Id: cnid_cdb_private.h,v 1.1.4.6 2004-02-07 19:46:09 didg Exp $
  */
 
 #ifndef LIBATALK_CDB_PRIVATE_H
@@ -9,6 +9,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <netatalk/endian.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -26,7 +28,6 @@
 #include <sys/cdefs.h>
 #include <db.h>
 
-#include <netatalk/endian.h>
 #include <atalk/logger.h>
 #include <atalk/adouble.h>
 #include <atalk/cnid.h>

diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c
index 289eee74b746f55bddb2860ae3b75c1977dd9b77..96345b71cdb4adc660e4998f3a28cc9386b00c87 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.c,v 1.1.4.16 2004-01-15 18:58:32 lenneis Exp $
+ * $Id: cnid_dbd.c,v 1.1.4.17 2004-02-07 19:46:09 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -569,7 +569,7 @@ char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t
     /* This mimicks the behaviour of the "regular" cnid_resolve. So far,
        nobody uses the content of buffer. It only provides space for the
        name in the caller. */
-    rply.name = buffer + CNID_HEADER_LEN;
+    rply.name = (char *)buffer + CNID_HEADER_LEN;
 
     if (transmit(db, &rqst, &rply) < 0) {
         errno = CNID_ERR_DB;

diff --git a/libatalk/util/strcasestr.c b/libatalk/util/strcasestr.c
index 31e65bee113474ec1f4a3db8c73d11e0f7723109..b26c89fff71b21fd5aaf3b2aaa8aac27559d5954 100644 (file)
--- a/libatalk/util/strcasestr.c
+++ b/libatalk/util/strcasestr.c
@@ -81,7 +81,7 @@ char * FUNC ( const char *phaystack, const char *pneedle)
                                a = *++haystack;
                                if (a == '\0')
                                        goto ret0;
-                 shloop:}
+                 shloop:;}
                        while (VAL(a) != VAL(b));
 
                  jin:a = *++haystack;