/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#ifdef AFS_SGI62_ENV
#include "h/hashing.h"
#endif
-#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN60_ENV)
+#if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV)
#include <netinet/in_var.h>
#endif /* ! AFS_HPUX110_ENV */
#endif /* !defined(UKERNEL) */
#include "afs/afs_stats.h" /* afs statistics */
#ifdef AFS_LINUX20_ENV
-#include "afs/afs_md5.h" /* For MD5 inodes - Linux only */
+#include "hcrypto/md5.h"
#endif
#if defined(AFS_SUN56_ENV)
char *
afs_cv2string(char *ttp, afs_uint32 aval)
{
- register char *tp = ttp;
- register int i;
+ char *tp = ttp;
+ int i;
int any;
AFS_STATCNT(afs_cv2string);
} /*afs_cv2string */
#endif
+/* not a generic strtoul replacement. for vol/vno/uniq, portable */
+
+afs_int32
+afs_strtoi_r(const char *str, char **endptr, afs_uint32 *ret)
+{
+ char *x;
+
+ *ret = 0;
+ *endptr = (char *)str;
+
+ if (!str)
+ return ERANGE;
+
+ for (x = (char *)str; *x >= '0' && *x <= '9'; x++) {
+ /* Check for impending overflow */
+ if (*ret > 429496729) { /* ULONG_MAX/10 */
+ *ret = 0;
+ *endptr = (char *)str;
+ return EINVAL;
+ }
+
+ *ret = (*ret * 10) + (*x - '0');
+ }
+
+ *endptr = x;
+ return 0;
+}
+
#ifndef afs_strcasecmp
int
afs_strcasecmp(char *s1, char *s2)
afs_strrchr(char *s, int c)
{
char *p = NULL;
-
+
do {
if (*s == c)
p = (char*) s;
int cc;
cc = strlen(s) + 1;
- n = (char *)afs_osi_Alloc(cc);
+ n = afs_osi_Alloc(cc);
if (n)
memcpy(n, s, cc);
print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
int flag)
{
- register struct server *aserver = sa->server;
+ struct server *aserver = sa->server;
char *ptr = "\n";
afs_uint32 address;
void
afs_CheckLocks(void)
{
- register int i;
+ int i;
afs_warn("Looking for locked data structures.\n");
- afs_warn("conn %lx, volume %lx, user %lx, cell %lx, server %lx\n", &afs_xconn,
+ afs_warn("conn %p, volume %p, user %p, cell %p, server %p\n", &afs_xconn,
&afs_xvolume, &afs_xuser, &afs_xcell, &afs_xserver);
{
- register struct vcache *tvc;
+ struct vcache *tvc;
AFS_STATCNT(afs_CheckLocks);
for (i = 0; i < VCSIZE; i++) {
for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
if (tvc->f.states & CVInit) continue;
-#ifdef AFS_OSF_ENV
- if (VREFCOUNT(tvc) > 1)
-#else /* AFS_OSF_ENV */
#ifdef AFS_DARWIN80_ENV
if (vnode_isinuse(AFSTOV(tvc), 0))
#else
if (VREFCOUNT(tvc))
#endif
-#endif
- afs_warn("Stat cache entry at %x is held\n", tvc);
+ afs_warn("Stat cache entry at %p is held\n", tvc);
if (CheckLock(&tvc->lock))
- afs_warn("Stat entry at %x is locked\n", tvc);
+ afs_warn("Stat entry at %p is locked\n", tvc);
}
}
}
{
- register struct dcache *tdc;
+ struct dcache *tdc;
for (i = 0; i < afs_cacheFiles; i++) {
tdc = afs_indexTable[i];
if (tdc) {
if (tdc->refCount)
- afs_warn("Disk entry %d at %x is held\n", i, tdc);
+ afs_warn("Disk entry %d at %p is held\n", i, tdc);
}
if (afs_indexFlags[i] & IFDataMod)
- afs_warn("Disk entry %d at %x has IFDataMod flag set.\n", i,
+ afs_warn("Disk entry %d at %p has IFDataMod flag set.\n", i,
tdc);
}
}
for (i = 0; i < NSERVERS; i++) {
for (ts = afs_servers[i]; ts; ts = ts->next) {
if (ts->flags & SRVR_ISDOWN)
- printf("Server entry %lx is marked down\n", (unsigned long)ts);
+ afs_warn("Server entry %p is marked down\n", ts);
for (sa = ts->addr; sa; sa = sa->next_sa) {
for (tc = sa->conns; tc; tc = tc->next) {
if (tc->refCount)
- afs_warn("conn at %x (server %x) is held\n", tc,
+ afs_warn("conn at %p (server %x) is held\n", tc,
sa->sa_ip);
}
}
for (i = 0; i < NVOLS; i++) {
for (tv = afs_volumes[i]; tv; tv = tv->next) {
if (CheckLock(&tv->lock))
- afs_warn("volume at %x is locked\n", tv);
+ afs_warn("volume at %p is locked\n", tv);
if (tv->refCount)
- afs_warn("volume at %x is held\n", tv);
+ afs_warn("volume at %p is held\n", tv);
}
}
}
for (i = 0; i < NUSERS; i++) {
for (tu = afs_users[i]; tu; tu = tu->next) {
if (tu->refCount)
- printf("user at %lx is held\n", (unsigned long)tu);
+ afs_warn("user at %lx is held\n", (unsigned long)tu);
}
}
}
afs_noop(void)
{
AFS_STATCNT(afs_noop);
-#ifdef AFS_OSF30_ENV
- return (EOPNOTSUPP);
-#else
return EINVAL;
-#endif
}
int
#ifdef AFS_LINUX20_ENV
-afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
-{
+afs_int32
+afs_calc_inum(afs_int32 volume, afs_int32 vnode)
+{
afs_int32 ino, vno = vnode;
char digest[16];
- struct afs_md5 ct;
-
+ struct md5 ct;
+
if (afs_new_inum) {
- AFS_MD5_Init(&ct);
- AFS_MD5_Update(&ct, &volume, 4);
- AFS_MD5_Update(&ct, &vnode, 4);
- AFS_MD5_Final(digest, &ct);
+ MD5_Init(&ct);
+ MD5_Update(&ct, &volume, 4);
+ MD5_Update(&ct, &vnode, 4);
+ MD5_Final(digest, &ct);
memcpy(&ino, digest, sizeof(afs_int32));
ino ^= (ino ^ vno) & 1;
} else {
#else
-afs_int32 afs_calc_inum (afs_int32 volume, afs_int32 vnode)
+afs_int32
+afs_calc_inum (afs_int32 volume, afs_int32 vnode)
{
return (volume << 16) + vnode;
}