Index: openafs/src/WINNT/afs_setup_utils/afsrm.c diff -c openafs/src/WINNT/afs_setup_utils/afsrm.c:1.2 openafs/src/WINNT/afs_setup_utils/afsrm.c:1.2.8.1 *** openafs/src/WINNT/afs_setup_utils/afsrm.c:1.2 Sat Nov 4 05:01:10 2000 --- openafs/src/WINNT/afs_setup_utils/afsrm.c Wed Sep 19 18:40:17 2001 *************** *** 50,56 **** int code; /* initialize command syntax */ ! initialize_cmd_error_table(); SetupCmd(); /* execute command */ --- 50,56 ---- int code; /* initialize command syntax */ ! initialize_CMD_error_table(); SetupCmd(); /* execute command */ Index: openafs/src/WINNT/afsadmsvr/NTMakefile diff -c openafs/src/WINNT/afsadmsvr/NTMakefile:1.2 openafs/src/WINNT/afsadmsvr/NTMakefile:1.2.8.1 *** openafs/src/WINNT/afsadmsvr/NTMakefile:1.2 Sat Nov 4 05:01:13 2000 --- openafs/src/WINNT/afsadmsvr/NTMakefile Wed Sep 19 18:32:42 2001 *************** *** 123,133 **** --- 123,143 ---- nmake /nologo /f ntmakefile primary $(CD) ..\afsadmsvr + afsapplib_clean : + $(CD) ..\afsapplib + nmake /nologo /f ntmakefile clean + $(CD) ..\afsadmsvr + afsclass_primary : $(CD) ..\afsclass nmake /nologo /f ntmakefile primary $(CD) ..\afsadmsvr + afsclass_clean : + $(CD) ..\afsclass + nmake /nologo /f ntmakefile clean + $(CD) ..\afsadmsvr + $(EXEFILE) : $(EXEOBJS) $(EXELIBS) $(EXECONLINK) $(VCLIBS) $(EXEPREP) *************** *** 141,147 **** afsclass_primary \ $(EXEFILE) ! clean:: if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h --- 151,157 ---- afsclass_primary \ $(EXEFILE) ! clean:: afsclass_clean afsapplib_clean if exist ITaAfsAdmSvr*.cpp del ITaAfsAdmSvr*.cpp if exist ITaAfsAdmSvr*.c del ITaAfsAdmSvr*.c if exist ITaAfsAdmSvr*.h del ITaAfsAdmSvr*.h Index: openafs/src/WINNT/afsd/cm_config.c diff -c openafs/src/WINNT/afsd/cm_config.c:1.3 openafs/src/WINNT/afsd/cm_config.c:1.3.4.1 *** openafs/src/WINNT/afsd/cm_config.c:1.3 Mon Apr 30 02:48:03 2001 --- openafs/src/WINNT/afsd/cm_config.c Wed Sep 19 18:36:15 2001 *************** *** 113,120 **** int foundCell; long code; int tracking = 1, partial = 0; - long ip_addr; #if defined(DJGPP) || defined(AFS_WIN95_ENV) int c1, c2, c3, c4; char aname[256]; #endif --- 113,120 ---- int foundCell; long code; int tracking = 1, partial = 0; #if defined(DJGPP) || defined(AFS_WIN95_ENV) + long ip_addr; int c1, c2, c3, c4; char aname[256]; #endif Index: openafs/src/WINNT/afsd/cm_utils.h diff -c openafs/src/WINNT/afsd/cm_utils.h:1.2 openafs/src/WINNT/afsd/cm_utils.h:1.2.8.1 *** openafs/src/WINNT/afsd/cm_utils.h:1.2 Sat Nov 4 05:01:40 2000 --- openafs/src/WINNT/afsd/cm_utils.h Wed Sep 19 18:40:19 2001 *************** *** 17,23 **** } cm_space_t; /* error code hack */ ! #define ERROR_TABLE_BASE_vl (363520L) #define VL_NOENT (363524L) extern cm_space_t *cm_GetSpace(void); --- 17,23 ---- } cm_space_t; /* error code hack */ ! #define ERROR_TABLE_BASE_VL (363520L) #define VL_NOENT (363524L) extern cm_space_t *cm_GetSpace(void); Index: openafs/src/WINNT/afsreg/test/regman.c diff -c openafs/src/WINNT/afsreg/test/regman.c:1.2 openafs/src/WINNT/afsreg/test/regman.c:1.2.8.1 *** openafs/src/WINNT/afsreg/test/regman.c:1.2 Sat Nov 4 05:01:49 2000 --- openafs/src/WINNT/afsreg/test/regman.c Wed Sep 19 18:40:20 2001 *************** *** 344,350 **** whoami = argv[0]; /* initialize command syntax */ ! initialize_cmd_error_table(); SetupVptCmd(); SetupDirCmd(); --- 344,350 ---- whoami = argv[0]; /* initialize command syntax */ ! initialize_CMD_error_table(); SetupVptCmd(); SetupDirCmd(); Index: openafs/src/WINNT/afssvrcfg/afscfg.cpp diff -c openafs/src/WINNT/afssvrcfg/afscfg.cpp:1.2 openafs/src/WINNT/afssvrcfg/afscfg.cpp:1.2.8.1 *** openafs/src/WINNT/afssvrcfg/afscfg.cpp:1.2 Sat Nov 4 05:01:49 2000 --- openafs/src/WINNT/afssvrcfg/afscfg.cpp Wed Sep 19 19:19:40 2001 *************** *** 180,195 **** return 0; } - // Check the version of the client. It must be at least 35. - if (g_CfgData.nClientVersion < 35) { - int nMajor, nMinor; - nMajor = g_CfgData.nClientVersion / 10; - nMinor = g_CfgData.nClientVersion - (nMajor * 10); - g_LogFile.Write("The version of the AFS Client on this machine (%d.%d) is too old to run the server. The Client must be at least version 3.5.\r\n", nMajor, nMinor); - ErrorDialog(0, IDS_ERROR_CLIENT_VERSION); - return 0; - } - // Run the appropriate interface if ((strstr(_strlwr(pszCmdLineA), "wizard") != 0)) RunWizard(); --- 180,185 ---- Index: openafs/src/WINNT/license/lang/NTMakefile diff -c openafs/src/WINNT/license/lang/NTMakefile:1.2 openafs/src/WINNT/license/lang/NTMakefile:1.2.8.1 *** openafs/src/WINNT/license/lang/NTMakefile:1.2 Sat Nov 4 05:03:04 2000 --- openafs/src/WINNT/license/lang/NTMakefile Wed Sep 19 18:32:46 2001 *************** *** 24,26 **** --- 24,28 ---- @$(DESTDIR)\bin\sgml2rtf -1252 es_ES.ide @$(DESTDIR)\bin\sgml2rtf -1252 de_DE.ide + clean :: + $(DEL) *.rtf Index: openafs/src/afs/afs_analyze.c diff -c openafs/src/afs/afs_analyze.c:1.6 openafs/src/afs/afs_analyze.c:1.6.4.1 *** openafs/src/afs/afs_analyze.c:1.6 Thu Jul 12 15:58:15 2001 --- openafs/src/afs/afs_analyze.c Wed Sep 19 18:40:21 2001 *************** *** 13,19 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_analyze.c,v 1.6 2001/07/12 19:58:15 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ --- 13,19 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_analyze.c,v 1.6.4.1 2001/09/19 22:40:21 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 48,60 **** /* shouldn't do it this way, but for now will do */ ! #ifndef ERROR_TABLE_BASE_u ! #define ERROR_TABLE_BASE_u (5376L) #endif /* ubik error base define */ /* same hack for vlserver error base as for ubik error base */ ! #ifndef ERROR_TABLE_BASE_vl ! #define ERROR_TABLE_BASE_vl (363520L) #define VL_NOENT (363524L) #endif /* vlserver error base define */ --- 48,60 ---- /* shouldn't do it this way, but for now will do */ ! #ifndef ERROR_TABLE_BASE_U ! #define ERROR_TABLE_BASE_U (5376L) #endif /* ubik error base define */ /* same hack for vlserver error base as for ubik error base */ ! #ifndef ERROR_TABLE_BASE_VL ! #define ERROR_TABLE_BASE_VL (363520L) #define VL_NOENT (363524L) #endif /* vlserver error base define */ *************** *** 481,487 **** shouldRetry = 1; acode = 0; } ! else if (acode == VICETOKENDEAD || (acode & ~0xff) == ERROR_TABLE_BASE_rxk) { /* any rxkad error is treated as token expiration */ struct unixuser *tu; --- 481,487 ---- shouldRetry = 1; acode = 0; } ! else if (acode == VICETOKENDEAD || (acode & ~0xff) == ERROR_TABLE_BASE_RXK) { /* any rxkad error is treated as token expiration */ struct unixuser *tu; *************** *** 525,531 **** shouldRetry = 0; } /* check for ubik errors; treat them like crashed servers */ ! else if (acode >= ERROR_TABLE_BASE_u && acode < ERROR_TABLE_BASE_u+255) { afs_ServerDown(sa); if (aerrP) (aerrP->err_Server)++; --- 525,531 ---- shouldRetry = 0; } /* check for ubik errors; treat them like crashed servers */ ! else if (acode >= ERROR_TABLE_BASE_U && acode < ERROR_TABLE_BASE_U+255) { afs_ServerDown(sa); if (aerrP) (aerrP->err_Server)++; *************** *** 561,568 **** } } } ! else if (acode >= ERROR_TABLE_BASE_vl ! && acode <= ERROR_TABLE_BASE_vl + 255) /* vlserver errors */ { shouldRetry = 0; areq->volumeError = VOLMISSING; } --- 561,568 ---- } } } ! else if (acode >= ERROR_TABLE_BASE_VL ! && acode <= ERROR_TABLE_BASE_VL + 255) /* vlserver errors */ { shouldRetry = 0; areq->volumeError = VOLMISSING; } Index: openafs/src/afs/afs_trace.et diff -c openafs/src/afs/afs_trace.et:1.3 openafs/src/afs/afs_trace.et:1.3.6.1 *** openafs/src/afs/afs_trace.et:1.3 Sat Feb 10 16:26:15 2001 --- openafs/src/afs/afs_trace.et Wed Sep 19 18:40:21 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table 2 zcm ec CM_TRACE_NULL, "dummy" ec CM_TRACE_PAGEIN, "getapage vp 0x%lx off 0x%x len 0x%x rw=0x%x" ec CM_TRACE_PAGEINDONE, "getapage done code 0x%x pg 0x%lx (0x%x)" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table 2 ZCM ec CM_TRACE_NULL, "dummy" ec CM_TRACE_PAGEIN, "getapage vp 0x%lx off 0x%x len 0x%x rw=0x%x" ec CM_TRACE_PAGEINDONE, "getapage done code 0x%x pg 0x%lx (0x%x)" Index: openafs/src/afs/afs_volume.c diff -c openafs/src/afs/afs_volume.c:1.6 openafs/src/afs/afs_volume.c:1.6.2.1 *** openafs/src/afs/afs_volume.c:1.6 Tue Aug 7 20:03:28 2001 --- openafs/src/afs/afs_volume.c Wed Sep 19 18:40:21 2001 *************** *** 18,24 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_volume.c,v 1.6 2001/08/08 00:03:28 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ --- 18,24 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/afs_volume.c,v 1.6.2.1 2001/09/19 22:40:21 shadow Exp $"); #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ *************** *** 56,66 **** extern int afs_totalSrvAddrs; /* In case we don't have the vl error table yet. */ ! #ifndef ERROR_TABLE_BASE_vl ! #define ERROR_TABLE_BASE_vl (363520L) ! #define VL_NOENT (363524L) #endif /* vlserver error base define */ - /* Exported variables */ ino_t volumeInode; /*Inode for VolumeItems file*/ --- 56,65 ---- extern int afs_totalSrvAddrs; /* In case we don't have the vl error table yet. */ ! #ifndef ERROR_TABLE_BASE_VL ! #define ERROR_TABLE_BASE_VL (363520L) ! #define VL_NOENT (363524L) #endif /* vlserver error base define */ /* Exported variables */ ino_t volumeInode; /*Inode for VolumeItems file*/ Index: openafs/src/afs/sysincludes.h diff -c openafs/src/afs/sysincludes.h:1.6 openafs/src/afs/sysincludes.h:1.6.4.1 *** openafs/src/afs/sysincludes.h:1.6 Sat Apr 14 13:27:33 2001 --- openafs/src/afs/sysincludes.h Wed Sep 19 18:25:22 2001 *************** *** 10,15 **** --- 10,48 ---- #ifndef __AFS_SYSINCLUDESH__ #define __AFS_SYSINCLUDESH__ 1 + #ifdef AFS_OBSD_ENV + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #else /* AFS_OBSD_ENV */ #ifdef AFS_LINUX22_ENV #include #include *************** *** 336,340 **** --- 369,374 ---- #endif /* AFS_OSF_ENV */ #endif /* AFS_LINUX22_ENV */ + #endif /* AFS_OBSD_ENV */ #endif /* __AFS_SYSINCLUDESH__ so idempotent */ Index: openafs/src/afs/LINUX/osi_vnodeops.c diff -c openafs/src/afs/LINUX/osi_vnodeops.c:1.29 openafs/src/afs/LINUX/osi_vnodeops.c:1.29.2.1 *** openafs/src/afs/LINUX/osi_vnodeops.c:1.29 Tue Aug 28 20:46:57 2001 --- openafs/src/afs/LINUX/osi_vnodeops.c Thu Sep 20 01:10:46 2001 *************** *** 23,29 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.29 2001/08/29 00:46:57 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" --- 23,29 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.29.2.1 2001/09/20 05:10:46 shadow Exp $"); #include "../afs/sysincludes.h" #include "../afs/afsincludes.h" *************** *** 134,139 **** --- 134,143 ---- ObtainWriteLock(&vcp->lock, 530); vcp->m.Date = osi_Time(); /* set modification time */ afs_FakeClose(vcp, credp); + if (code>=0) + code2 = afs_DoPartialWrite(vcp, &treq); + if (code2 && code >=0) + code = (ssize_t) -code2; ReleaseWriteLock(&vcp->lock); afs_Trace4(afs_iclSetp, CM_TRACE_WRITEOP, ICL_TYPE_POINTER, vcp, Index: openafs/src/afs/VNOPS/afs_vnop_write.c diff -c openafs/src/afs/VNOPS/afs_vnop_write.c:1.8 openafs/src/afs/VNOPS/afs_vnop_write.c:1.8.2.2 *** openafs/src/afs/VNOPS/afs_vnop_write.c:1.8 Tue Aug 28 20:47:00 2001 --- openafs/src/afs/VNOPS/afs_vnop_write.c Thu Sep 20 01:10:47 2001 *************** *** 20,26 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.8 2001/08/29 00:47:00 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ --- 20,26 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/afs/VNOPS/afs_vnop_write.c,v 1.8.2.2 2001/09/20 05:10:47 shadow Exp $"); #include "../afs/sysincludes.h" /* Standard vendor system headers */ #include "../afs/afsincludes.h" /* Afs-based standard headers */ *************** *** 171,177 **** return (EFBIG); } #endif ! #if (!defined(AFS_VM_RDWR_ENV)||defined(AFS_LINUX20_ENV)) /* * If write is implemented via VM, afs_FakeOpen() is called from the * high-level write op. --- 171,177 ---- return (EFBIG); } #endif ! #ifdef AFS_VM_RDWR_ENV /* * If write is implemented via VM, afs_FakeOpen() is called from the * high-level write op. *************** *** 280,286 **** if (filePos > avc->m.Length) avc->m.Length = filePos; #endif ! #if (!defined(AFS_VM_RDWR_ENV)||defined(AFS_LINUX20_ENV)) /* * If write is implemented via VM, afs_DoPartialWrite() is called from * the high-level write op. --- 280,286 ---- if (filePos > avc->m.Length) avc->m.Length = filePos; #endif ! #ifndef AFS_VM_RDWR_ENV /* * If write is implemented via VM, afs_DoPartialWrite() is called from * the high-level write op. Index: openafs/src/afsd/afs.ppc_darwin_12.plist diff -c openafs/src/afsd/afs.ppc_darwin_12.plist:1.1 openafs/src/afsd/afs.ppc_darwin_12.plist:removed *** openafs/src/afsd/afs.ppc_darwin_12.plist:1.1 Mon Sep 10 16:07:34 2001 --- openafs/src/afsd/afs.ppc_darwin_12.plist Fri Sep 21 20:05:52 2001 *************** *** 1,11 **** - { - Description = "OpenAFS network file system"; - Provides = ("AFS"); - Requires = ("Resolver"); - OrderPreference = "None"; - Messages = - { - start = "Starting OpenAFS file system"; - stop = "Stopping OpenAFS file system"; - }; - } --- 0 ---- Index: openafs/src/afsd/afs.ppc_darwin_13.plist diff -c openafs/src/afsd/afs.ppc_darwin_13.plist:1.1 openafs/src/afsd/afs.ppc_darwin_13.plist:removed *** openafs/src/afsd/afs.ppc_darwin_13.plist:1.1 Mon Sep 10 16:07:34 2001 --- openafs/src/afsd/afs.ppc_darwin_13.plist Fri Sep 21 20:05:52 2001 *************** *** 1,11 **** - { - Description = "OpenAFS network file system"; - Provides = ("AFS"); - Requires = ("Resolver"); - OrderPreference = "None"; - Messages = - { - start = "Starting OpenAFS file system"; - stop = "Stopping OpenAFS file system"; - }; - } --- 0 ---- Index: openafs/src/afsd/afsd.c diff -c openafs/src/afsd/afsd.c:1.13 openafs/src/afsd/afsd.c:1.13.2.1 *** openafs/src/afsd/afsd.c:1.13 Thu Aug 2 12:16:34 2001 --- openafs/src/afsd/afsd.c Wed Sep 19 18:25:23 2001 *************** *** 55,61 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/afsd/afsd.c,v 1.13 2001/08/02 16:16:34 shadow Exp $"); #define VFS 1 --- 55,61 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/afsd/afsd.c,v 1.13.2.1 2001/09/19 22:25:23 shadow Exp $"); #define VFS 1 *************** *** 146,152 **** #if AFS_HAVE_STATVFS #include #else ! #if !defined(AFS_OSF_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif --- 146,152 ---- #if AFS_HAVE_STATVFS #include #else ! #if !defined(AFS_OSF_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif Index: openafs/src/auth/NTMakefile diff -c openafs/src/auth/NTMakefile:1.3 openafs/src/auth/NTMakefile:1.3.4.1 *** openafs/src/auth/NTMakefile:1.3 Mon Apr 30 02:52:54 2001 --- openafs/src/auth/NTMakefile Wed Sep 19 18:32:46 2001 *************** *** 108,113 **** clean:: $(DEL) acfg_errors.c ktc_errors.c $(DEL) $(INCFILEDIR)\auth.h $(INCFILEDIR)\cellconfig.h - setkey: $(SETKEY_EXEFILE) --- 108,114 ---- clean:: $(DEL) acfg_errors.c ktc_errors.c $(DEL) $(INCFILEDIR)\auth.h $(INCFILEDIR)\cellconfig.h + $(DEL) auth.h cellconfig.h setkey: $(SETKEY_EXEFILE) + Index: openafs/src/auth/acfg_errors.et diff -c openafs/src/auth/acfg_errors.et:1.2 openafs/src/auth/acfg_errors.et:1.2.8.1 *** openafs/src/auth/acfg_errors.et:1.2 Sat Nov 4 05:03:55 2000 --- openafs/src/auth/acfg_errors.et Wed Sep 19 18:40:22 2001 *************** *** 9,15 **** # AFS Configuration Package error table ! error_table acfg ec AFSCONF_FAILURE, "mysterious failure" ec AFSCONF_NOTFOUND, "could not find entry" ec AFSCONF_UNKNOWN, "do not know that information" --- 9,15 ---- # AFS Configuration Package error table ! error_table ACFG ec AFSCONF_FAILURE, "mysterious failure" ec AFSCONF_NOTFOUND, "could not find entry" ec AFSCONF_UNKNOWN, "do not know that information" Index: openafs/src/auth/authcon.c diff -c openafs/src/auth/authcon.c:1.6 openafs/src/auth/authcon.c:1.6.4.1 *** openafs/src/auth/authcon.c:1.6 Thu Jul 12 15:58:25 2001 --- openafs/src/auth/authcon.c Wed Sep 19 18:36:18 2001 *************** *** 14,20 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/auth/authcon.c,v 1.6 2001/07/12 19:58:25 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 14,20 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/auth/authcon.c,v 1.6.4.1 2001/09/19 22:36:18 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 99,107 **** struct rx_securityClass *tclass; afs_int32 kvno; afs_int32 ticketLen; ! struct timeval tv; ! Key_schedule schedule; ! register afs_int32 i, code; /* first, find the right key and kvno to use */ code = afsconf_GetLatestKey(adir, &kvno, &key); --- 99,105 ---- struct rx_securityClass *tclass; afs_int32 kvno; afs_int32 ticketLen; ! register afs_int32 code; /* first, find the right key and kvno to use */ code = afsconf_GetLatestKey(adir, &kvno, &key); Index: openafs/src/auth/cellconfig.c diff -c openafs/src/auth/cellconfig.c:1.14 openafs/src/auth/cellconfig.c:1.14.2.1 *** openafs/src/auth/cellconfig.c:1.14 Tue Aug 7 20:03:37 2001 --- openafs/src/auth/cellconfig.c Wed Sep 19 18:36:18 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/cellconfig.c,v 1.14 2001/08/08 00:03:37 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/cellconfig.c,v 1.14.2.1 2001/09/19 22:36:18 shadow Exp $"); #include #include *************** *** 191,200 **** --- 191,205 ---- static afsconf_Touch(adir) register struct afsconf_dir *adir; { char tbuffer[256]; + #ifndef AFS_NT40_ENV struct timeval tvp[2]; + #endif + + adir->timeRead = 0; /* just in case */ #ifdef AFS_NT40_ENV /* NT client CellServDB has different file name than NT server or Unix */ + if (IsClientConfigDirectory(adir->name)) { strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE_NTCLIENT, NULL); *************** *** 202,215 **** strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL); } - #else - strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL); - #endif /* AFS_NT40_ENV */ - adir->timeRead = 0; /* just in case */ - #ifdef AFS_NT40_ENV return _utime(tbuffer, NULL); #else gettimeofday(&tvp[0], NULL); tvp[1] = tvp[0]; return utimes(tbuffer, tvp); --- 207,217 ---- strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL); } return _utime(tbuffer, NULL); + #else + strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLSERVDB_FILE, NULL); gettimeofday(&tvp[0], NULL); tvp[1] = tvp[0]; return utimes(tbuffer, tvp); *************** *** 238,244 **** /* The "AFSCONF" environment (or contents of "/.AFSCONF") will be typically set to something like "/afs//common/etc" where, by convention, the default files for "ThisCell" and "CellServDB" will reside; note that a major drawback is that a given afs client on that cell may NOT contain the same contents... */ char *home_dir; FILE *fp; ! int len; if (!(home_dir = getenv("HOME"))) { /* Our last chance is the "/.AFSCONF" file */ --- 240,246 ---- /* The "AFSCONF" environment (or contents of "/.AFSCONF") will be typically set to something like "/afs//common/etc" where, by convention, the default files for "ThisCell" and "CellServDB" will reside; note that a major drawback is that a given afs client on that cell may NOT contain the same contents... */ char *home_dir; FILE *fp; ! size_t len; if (!(home_dir = getenv("HOME"))) { /* Our last chance is the "/.AFSCONF" file */ *************** *** 557,563 **** struct afsconf_cell *acellInfo; { afs_int32 code; ! int tservice, len, i; unsigned char answer[1024]; unsigned char *p; char host[256]; --- 559,566 ---- struct afsconf_cell *acellInfo; { afs_int32 code; ! int tservice, i; ! size_t len; unsigned char answer[1024]; unsigned char *p; char host[256]; *************** *** 654,660 **** register afs_int32 i; int tservice; char *tcell; ! int cnLen, ambig; char tbuffer[64]; LOCK_GLOBAL_MUTEX --- 657,664 ---- register afs_int32 i; int tservice; char *tcell; ! size_t cnLen; ! int ambig; char tbuffer[64]; LOCK_GLOBAL_MUTEX Index: openafs/src/auth/ktc_errors.et diff -c openafs/src/auth/ktc_errors.et:1.2 openafs/src/auth/ktc_errors.et:1.2.8.1 *** openafs/src/auth/ktc_errors.et:1.2 Sat Nov 4 05:03:57 2000 --- openafs/src/auth/ktc_errors.et Wed Sep 19 18:40:22 2001 *************** *** 9,15 **** # Kerberos Ticket Cache error table ! error_table ktc ec KTC_ERROR, "an unexpected error was encountered" ec KTC_TOOBIG, "a buffer was too small for the response" ec KTC_INVAL, "an invalid argument was passed in" --- 9,15 ---- # Kerberos Ticket Cache error table ! error_table KTC ec KTC_ERROR, "an unexpected error was encountered" ec KTC_TOOBIG, "a buffer was too small for the response" ec KTC_INVAL, "an invalid argument was passed in" Index: openafs/src/auth/userok.c diff -c openafs/src/auth/userok.c:1.7 openafs/src/auth/userok.c:1.7.4.1 *** openafs/src/auth/userok.c:1.7 Thu Jul 12 15:58:26 2001 --- openafs/src/auth/userok.c Wed Sep 19 18:36:18 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/userok.c,v 1.7 2001/07/12 19:58:26 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/auth/userok.c,v 1.7.4.1 2001/09/19 22:36:18 shadow Exp $"); #include #include *************** *** 231,237 **** char tbuffer[256]; register bufio_p bp; char tname[64]; - register char *tp; register int flag; register afs_int32 code; int rc; --- 231,236 ---- Index: openafs/src/bozo/NTMakefile diff -c openafs/src/bozo/NTMakefile:1.2 openafs/src/bozo/NTMakefile:1.2.8.1 *** openafs/src/bozo/NTMakefile:1.2 Sat Nov 4 05:03:58 2000 --- openafs/src/bozo/NTMakefile Wed Sep 19 18:32:47 2001 *************** *** 144,146 **** --- 144,147 ---- # Local clean target; augments predefined clean target clean:: + $(DEL) bnode.h boserr.c bosint.cs.c bosint.h bosint.ss.c bosint.xdr.c Index: openafs/src/bozo/bos.c diff -c openafs/src/bozo/bos.c:1.10 openafs/src/bozo/bos.c:1.10.2.2 *** openafs/src/bozo/bos.c:1.10 Tue Aug 7 20:03:38 2001 --- openafs/src/bozo/bos.c Wed Sep 19 18:40:23 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bos.c,v 1.10 2001/08/08 00:03:38 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bos.c,v 1.10.2.2 2001/09/19 22:40:23 shadow Exp $"); #include #include *************** *** 387,392 **** --- 387,393 ---- printf("\n"); } } + return 0; } static UnInstall(as) *************** *** 1791,1798 **** afsconf_SawCell = 0; /* Reset it */ /* don't check error code, since fails sometimes when we're setting up a * system */ ! initialize_cmd_error_table(); ! initialize_bz_error_table(); ts = cmd_CreateSyntax("start", StartServer, 0, "start running a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); --- 1792,1799 ---- afsconf_SawCell = 0; /* Reset it */ /* don't check error code, since fails sometimes when we're setting up a * system */ ! initialize_CMD_error_table(); ! initialize_BZ_error_table(); ts = cmd_CreateSyntax("start", StartServer, 0, "start running a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); Index: openafs/src/bozo/boserr.et diff -c openafs/src/bozo/boserr.et:1.2 openafs/src/bozo/boserr.et:1.2.8.1 *** openafs/src/bozo/boserr.et:1.2 Sat Nov 4 05:03:59 2000 --- openafs/src/bozo/boserr.et Wed Sep 19 18:40:23 2001 *************** *** 10,16 **** # NOTE: BZACCESS value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table bz ec BZNOTACTIVE, "process not active" ec BZNOENT, "no such entity" ec BZBUSY, "can't do operation now" --- 10,16 ---- # NOTE: BZACCESS value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table BZ ec BZNOTACTIVE, "process not active" ec BZNOENT, "no such entity" ec BZBUSY, "can't do operation now" Index: openafs/src/bozo/bosoprocs.c diff -c openafs/src/bozo/bosoprocs.c:1.6 openafs/src/bozo/bosoprocs.c:1.6.2.1 *** openafs/src/bozo/bosoprocs.c:1.6 Tue Aug 7 20:03:38 2001 --- openafs/src/bozo/bosoprocs.c Wed Sep 19 18:36:19 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bosoprocs.c,v 1.6 2001/08/08 00:03:38 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bosoprocs.c,v 1.6.2.1 2001/09/19 22:36:19 shadow Exp $"); #include #include *************** *** 147,153 **** struct rx_call *acall; char *aname; afs_int32 *atime, *abakTime, *aoldTime; { - register afs_int32 code; struct stat tstat; char *strp; char tbuffer[AFSDIR_PATH_MAX]; --- 147,152 ---- *************** *** 1191,1196 **** --- 1190,1196 ---- bozo_bosEntryStats[7].path = AFSDIR_SERVER_KEY_FILEPATH; bozo_bosEntryStats[8].path = AFSDIR_SERVER_ULIST_FILEPATH; + return 0; } /* StatEachEntry - If it's not there, it is okay. If anything else goes wrong * complain. Otherwise check permissions: shouldn't allow write or (usually) Index: openafs/src/bozo/bosserver.c diff -c openafs/src/bozo/bosserver.c:1.12 openafs/src/bozo/bosserver.c:1.12.2.1 *** openafs/src/bozo/bosserver.c:1.12 Tue Aug 7 20:03:38 2001 --- openafs/src/bozo/bosserver.c Wed Sep 19 18:36:19 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bosserver.c,v 1.12 2001/08/08 00:03:38 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/bosserver.c,v 1.12.2.1 2001/09/19 22:36:19 shadow Exp $"); #include #include *************** *** 52,57 **** --- 52,60 ---- extern int RXSTATS_ExecuteRequest(); extern int afsconf_GetKey(); extern struct bnode_ops fsbnode_ops, ezbnode_ops, cronbnode_ops; + + void bozo_Log(); + struct afsconf_dir *bozo_confdir = 0; /* bozo configuration dir */ static char *bozo_pid; struct rx_securityClass *bozo_rxsc[3]; *************** *** 666,672 **** int noAuth = 0; struct ktc_encryptionKey tkey; int i; - pid_t newSessionID; char namebuf[AFSDIR_PATH_MAX]; #ifdef AFS_AIX32_ENV --- 669,674 ---- *************** *** 919,924 **** --- 921,927 ---- rx_StartServer(1); /* donate this process */ } + void bozo_Log(a,b,c,d,e,f) char *a, *b, *c, *d, *e, *f; { char tdate[26]; Index: openafs/src/bozo/cronbnodeops.c diff -c openafs/src/bozo/cronbnodeops.c:1.5 openafs/src/bozo/cronbnodeops.c:1.5.2.1 *** openafs/src/bozo/cronbnodeops.c:1.5 Tue Aug 7 20:03:38 2001 --- openafs/src/bozo/cronbnodeops.c Wed Sep 19 18:36:19 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/cronbnodeops.c,v 1.5 2001/08/08 00:03:38 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/cronbnodeops.c,v 1.5.2.1 2001/09/19 22:36:19 shadow Exp $"); #include #include *************** *** 120,125 **** --- 120,126 ---- if (temp < 1) temp = 1; /* temp is when to start dude */ bnode_SetTimeout(abnode, temp); } + return 0; } static int cron_restartp (abnode) Index: openafs/src/bozo/fsbnodeops.c diff -c openafs/src/bozo/fsbnodeops.c:1.7 openafs/src/bozo/fsbnodeops.c:1.7.2.1 *** openafs/src/bozo/fsbnodeops.c:1.7 Tue Aug 7 20:03:38 2001 --- openafs/src/bozo/fsbnodeops.c Wed Sep 19 18:36:19 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/fsbnodeops.c,v 1.7 2001/08/08 00:03:38 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bozo/fsbnodeops.c,v 1.7.2.1 2001/09/19 22:36:19 shadow Exp $"); #include #include *************** *** 397,402 **** --- 397,403 ---- } } SetNeedsClock(abnode); + return 0; } static int fs_getstat(abnode, astatus) Index: openafs/src/bubasics/butc_errs.et diff -c openafs/src/bubasics/butc_errs.et:1.2 openafs/src/bubasics/butc_errs.et:1.2.8.1 *** openafs/src/bubasics/butc_errs.et:1.2 Sat Nov 4 05:04:03 2000 --- openafs/src/bubasics/butc_errs.et Wed Sep 19 18:40:24 2001 *************** *** 7,13 **** # Backup Tape Coordinator Module error table ! error_table butc # dump/restore management ec TC_DUMPERROR, "error in dump/restore process " ec TC_FORCEDABORT, "ungraceful abort " --- 7,13 ---- # Backup Tape Coordinator Module error table ! error_table BUTC # dump/restore management ec TC_DUMPERROR, "error in dump/restore process " ec TC_FORCEDABORT, "ungraceful abort " Index: openafs/src/bubasics/butm_errs.et diff -c openafs/src/bubasics/butm_errs.et:1.2 openafs/src/bubasics/butm_errs.et:1.2.8.1 *** openafs/src/bubasics/butm_errs.et:1.2 Sat Nov 4 05:04:03 2000 --- openafs/src/bubasics/butm_errs.et Wed Sep 19 18:40:24 2001 *************** *** 9,15 **** # Backup Tape Module error table ! error_table butm ec BUTM_OLDINTERFACE, "interface incompatible" ec BUTM_NOMOUNT, "there is not an opened tape" ec BUTM_PARALLELMOUNTS, "multiple simultaneous opens not permitted" --- 9,15 ---- # Backup Tape Module error table ! error_table BUTM ec BUTM_OLDINTERFACE, "interface incompatible" ec BUTM_NOMOUNT, "there is not an opened tape" ec BUTM_PARALLELMOUNTS, "multiple simultaneous opens not permitted" Index: openafs/src/bubasics/butx_errs.et diff -c openafs/src/bubasics/butx_errs.et:1.2 openafs/src/bubasics/butx_errs.et:1.2.8.1 *** openafs/src/bubasics/butx_errs.et:1.2 Sat Nov 4 05:04:03 2000 --- openafs/src/bubasics/butx_errs.et Wed Sep 19 18:40:24 2001 *************** *** 8,14 **** # Backup BUTX error table # ! error_table butx ec BUTX_RCSID, "Version 1" ec BUTX_NOLIBRARY, "XBSA couldn't mount shared library" ec BUTX_ILLEGALINIT, "XBSA handle already initialized" --- 8,14 ---- # Backup BUTX error table # ! error_table BUTX ec BUTX_RCSID, "Version 1" ec BUTX_NOLIBRARY, "XBSA couldn't mount shared library" ec BUTX_ILLEGALINIT, "XBSA handle already initialized" Index: openafs/src/bucoord/NTMakefile diff -c openafs/src/bucoord/NTMakefile:1.2 openafs/src/bucoord/NTMakefile:1.2.8.1 *** openafs/src/bucoord/NTMakefile:1.2 Sat Nov 4 05:04:03 2000 --- openafs/src/bucoord/NTMakefile Wed Sep 19 18:32:48 2001 *************** *** 110,113 **** --- 110,114 ---- # Local clean target; augments predefined clean target clean:: + $(DEL) bc.h bucoord_errs.c Index: openafs/src/bucoord/bucoord_errs.et diff -c openafs/src/bucoord/bucoord_errs.et:1.2 openafs/src/bucoord/bucoord_errs.et:1.2.8.1 *** openafs/src/bucoord/bucoord_errs.et:1.2 Sat Nov 4 05:04:04 2000 --- openafs/src/bucoord/bucoord_errs.et Wed Sep 19 18:40:24 2001 *************** *** 7,13 **** # Backup Coordinator Module error table ! error_table bucd ec BC_BADARG, "Unacceptable user supplied argument" ec BC_VERSIONMISMATCH, "Object has been updated" ec BC_NOTUNIQUE, "Search matched more than one item" --- 7,13 ---- # Backup Coordinator Module error table ! error_table BUCD ec BC_BADARG, "Unacceptable user supplied argument" ec BC_VERSIONMISMATCH, "Object has been updated" ec BC_NOTUNIQUE, "Search matched more than one item" Index: openafs/src/bucoord/main.c diff -c openafs/src/bucoord/main.c:1.6 openafs/src/bucoord/main.c:1.6.2.1 *** openafs/src/bucoord/main.c:1.6 Tue Aug 7 20:03:39 2001 --- openafs/src/bucoord/main.c Wed Sep 19 18:40:24 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/bucoord/main.c,v 1.6 2001/08/08 00:03:39 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/bucoord/main.c,v 1.6.2.1 2001/09/19 22:40:24 shadow Exp $"); #include #include *************** *** 108,125 **** */ void InitErrTabs() { ! initialize_acfg_error_table(); ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); ! initialize_butm_error_table(); ! initialize_vols_error_table(); ! initialize_butc_error_table(); ! initialize_butx_error_table(); ! initialize_budb_error_table(); ! initialize_bucd_error_table(); ! initialize_ktc_error_table(); } /* --- 108,125 ---- */ void InitErrTabs() { ! initialize_ACFG_error_table(); ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_CMD_error_table(); ! initialize_VL_error_table(); ! initialize_BUTM_error_table(); ! initialize_VOLS_error_table(); ! initialize_BUTC_error_table(); ! initialize_BUTX_error_table(); ! initialize_BUDB_error_table(); ! initialize_BUCD_error_table(); ! initialize_KTC_error_table(); } /* *************** *** 232,238 **** extern statusWatcher(); /* Initialization */ ! initialize_cmd_error_table(); /* don't run more than once */ if (initd) --- 232,238 ---- extern statusWatcher(); /* Initialization */ ! initialize_CMD_error_table(); /* don't run more than once */ if (initd) Index: openafs/src/budb/NTMakefile diff -c openafs/src/budb/NTMakefile:1.2 openafs/src/budb/NTMakefile:1.2.8.1 *** openafs/src/budb/NTMakefile:1.2 Sat Nov 4 05:04:08 2000 --- openafs/src/budb/NTMakefile Wed Sep 19 18:32:49 2001 *************** *** 116,120 **** clean:: $(DEL) budb_errs.c budb_errs.h budb.h budb_client.h ! ! --- 116,119 ---- clean:: $(DEL) budb_errs.c budb_errs.h budb.h budb_client.h ! $(DEL) budb.cs.c budb.ss.c budb.xdr.c Index: openafs/src/budb/budb_errs.et diff -c openafs/src/budb/budb_errs.et:1.2 openafs/src/budb/budb_errs.et:1.2.8.1 *** openafs/src/budb/budb_errs.et:1.2 Sat Nov 4 05:04:09 2000 --- openafs/src/budb/budb_errs.et Wed Sep 19 18:40:25 2001 *************** *** 12,18 **** # NOTE: BUDB_NOTPERMITTED value is hardcoded in audit/audit.h, so if you # make changes here, make sure that audit/audit.h is kept up to date. ! error_table budb #useful errors ec BUDB_DUMPIDEXISTS, "dump with specified id already exists" ec BUDB_NODUMPID, "no dump matching the id was found" --- 12,18 ---- # NOTE: BUDB_NOTPERMITTED value is hardcoded in audit/audit.h, so if you # make changes here, make sure that audit/audit.h is kept up to date. ! error_table BUDB #useful errors ec BUDB_DUMPIDEXISTS, "dump with specified id already exists" ec BUDB_NODUMPID, "no dump matching the id was found" Index: openafs/src/budb/server.c diff -c openafs/src/budb/server.c:1.6 openafs/src/budb/server.c:1.6.2.1 *** openafs/src/budb/server.c:1.6 Tue Aug 7 20:03:40 2001 --- openafs/src/budb/server.c Wed Sep 19 18:40:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/budb/server.c,v 1.6 2001/08/08 00:03:40 shadow Exp $"); #ifdef AFS_NT40_ENV #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/budb/server.c,v 1.6.2.1 2001/09/19 22:40:25 shadow Exp $"); #ifdef AFS_NT40_ENV #include *************** *** 339,345 **** #endif osi_audit(BUDB_StartEvent, 0, AUD_END); ! initialize_budb_error_table(); initializeArgHandler(); /* Initialize dirpaths */ --- 339,345 ---- #endif osi_audit(BUDB_StartEvent, 0, AUD_END); ! initialize_BUDB_error_table(); initializeArgHandler(); /* Initialize dirpaths */ Index: openafs/src/butc/tcmain.c diff -c openafs/src/butc/tcmain.c:1.5 openafs/src/butc/tcmain.c:1.5.2.1 *** openafs/src/butc/tcmain.c:1.5 Tue Aug 7 20:03:40 2001 --- openafs/src/butc/tcmain.c Wed Sep 19 18:40:26 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/tcmain.c,v 1.5 2001/08/08 00:03:40 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butc/tcmain.c,v 1.5.2.1 2001/09/19 22:40:26 shadow Exp $"); #include #include *************** *** 838,857 **** debugLevel = 0; /*initialize the error tables */ ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); ! initialize_butm_error_table(); ! initialize_butc_error_table(); #ifdef xbsa ! initialize_butx_error_table(); #endif /*xbs*/ ! initialize_vols_error_table(); ! initialize_budb_error_table(); ! initialize_bucd_error_table(); if (as->parms[0].items) { --- 838,857 ---- debugLevel = 0; /*initialize the error tables */ ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_CMD_error_table(); ! initialize_VL_error_table(); ! initialize_BUTM_error_table(); ! initialize_BUTC_error_table(); #ifdef xbsa ! initialize_BUTX_error_table(); #endif /*xbs*/ ! initialize_VOLS_error_table(); ! initialize_BUDB_error_table(); ! initialize_BUCD_error_table(); if (as->parms[0].items) { Index: openafs/src/butm/butm_test.c diff -c openafs/src/butm/butm_test.c:1.5 openafs/src/butm/butm_test.c:1.5.2.1 *** openafs/src/butm/butm_test.c:1.5 Tue Aug 7 20:03:40 2001 --- openafs/src/butm/butm_test.c Wed Sep 19 18:40:27 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/butm_test.c,v 1.5 2001/08/08 00:03:40 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/butm_test.c,v 1.5.2.1 2001/09/19 22:40:27 shadow Exp $"); #include #include *************** *** 71,77 **** /* ------------- * General Setup * ------------- */ ! initialize_butm_error_table(); tapeInfo.structVersion = BUTM_MAJORVERSION; --- 71,77 ---- /* ------------- * General Setup * ------------- */ ! initialize_BUTM_error_table(); tapeInfo.structVersion = BUTM_MAJORVERSION; Index: openafs/src/butm/test_ftm.c diff -c openafs/src/butm/test_ftm.c:1.5 openafs/src/butm/test_ftm.c:1.5.2.1 *** openafs/src/butm/test_ftm.c:1.5 Tue Aug 7 20:03:40 2001 --- openafs/src/butm/test_ftm.c Wed Sep 19 18:40:27 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/test_ftm.c,v 1.5 2001/08/08 00:03:40 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/butm/test_ftm.c,v 1.5.2.1 2001/09/19 22:40:27 shadow Exp $"); #include #include *************** *** 114,120 **** TestInfo ti; whoami = argv[0]; ! initialize_butm_error_table(); if (argc < 2) goto usage; --- 114,120 ---- TestInfo ti; whoami = argv[0]; ! initialize_BUTM_error_table(); if (argc < 2) goto usage; Index: openafs/src/cmd/NTMakefile diff -c openafs/src/cmd/NTMakefile:1.3 openafs/src/cmd/NTMakefile:1.3.4.1 *** openafs/src/cmd/NTMakefile:1.3 Mon Apr 30 02:53:12 2001 --- openafs/src/cmd/NTMakefile Wed Sep 19 18:32:50 2001 *************** *** 38,44 **** install9x: install clean:: ! $(DEL) cmd_errors.c $(DEL) $(LIBFILE) test tests: --- 38,44 ---- install9x: install clean:: ! $(DEL) cmd_errors.c cmd.h $(DEL) $(LIBFILE) test tests: Index: openafs/src/cmd/cmd.c diff -c openafs/src/cmd/cmd.c:1.6 openafs/src/cmd/cmd.c:1.6.4.1 *** openafs/src/cmd/cmd.c:1.6 Thu Jul 12 15:58:29 2001 --- openafs/src/cmd/cmd.c Wed Sep 19 18:36:20 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/cmd/cmd.c,v 1.6 2001/07/12 19:58:29 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/cmd/cmd.c,v 1.6.4.1 2001/09/19 22:36:20 shadow Exp $"); #include #include *************** *** 68,74 **** register struct cmd_syndesc *as; register char *aname; { register int i; ! int cmdlen; int ambig; int best; --- 68,74 ---- register struct cmd_syndesc *as; register char *aname; { register int i; ! size_t cmdlen; int ambig; int best; *************** *** 95,101 **** char *aname; { register struct cmd_syndesc *ts; struct cmd_syndesc *best; ! int cmdLen; int ambig; cmdLen = strlen(aname); --- 95,101 ---- char *aname; { register struct cmd_syndesc *ts; struct cmd_syndesc *best; ! size_t cmdLen; int ambig; cmdLen = strlen(aname); *************** *** 199,205 **** register struct cmd_syndesc *as; { register int i; register struct cmd_parmdesc *tp; ! int flag_width; char *flag_prefix; /* find flag name length */ --- 199,205 ---- register struct cmd_syndesc *as; { register int i; register struct cmd_parmdesc *tp; ! size_t flag_width; char *flag_prefix; /* find flag name length */ Index: openafs/src/cmd/cmd_errors.et diff -c openafs/src/cmd/cmd_errors.et:1.2 openafs/src/cmd/cmd_errors.et:1.2.8.1 *** openafs/src/cmd/cmd_errors.et:1.2 Sat Nov 4 05:04:18 2000 --- openafs/src/cmd/cmd_errors.et Wed Sep 19 18:40:28 2001 *************** *** 7,13 **** # */ ! error_table cmd ec CMD_EXCESSPARMS, "More than the maximum number of parameters defined" ec CMD_INTERNALERROR, "Internal parsing error" ec CMD_NOTLIST, "Too many values specified after a CMD_SINGLE switch" --- 7,13 ---- # */ ! error_table CMD ec CMD_EXCESSPARMS, "More than the maximum number of parameters defined" ec CMD_INTERNALERROR, "Internal parsing error" ec CMD_NOTLIST, "Too many values specified after a CMD_SINGLE switch" Index: openafs/src/cmd/test/itest.c diff -c openafs/src/cmd/test/itest.c:1.4 openafs/src/cmd/test/itest.c:1.4.4.1 *** openafs/src/cmd/test/itest.c:1.4 Thu Jul 12 15:58:32 2001 --- openafs/src/cmd/test/itest.c Wed Sep 19 18:40:29 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/cmd/test/itest.c,v 1.4 2001/07/12 19:58:32 shadow Exp $"); #include "cmd.h" #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/cmd/test/itest.c,v 1.4.4.1 2001/09/19 22:40:29 shadow Exp $"); #include "cmd.h" #include *************** *** 54,60 **** long code; char *tv[100]; ! initialize_cmd_error_table(); ts = cmd_CreateSyntax("apple", cproc1, (char *) 0, "describe apple"); --- 54,60 ---- long code; char *tv[100]; ! initialize_CMD_error_table(); ts = cmd_CreateSyntax("apple", cproc1, (char *) 0, "describe apple"); Index: openafs/src/comerr/compile_et.c diff -c openafs/src/comerr/compile_et.c:1.6 openafs/src/comerr/compile_et.c:1.6.4.1 *** openafs/src/comerr/compile_et.c:1.6 Thu Jul 12 15:58:32 2001 --- openafs/src/comerr/compile_et.c Wed Sep 19 18:40:30 2001 *************** *** 11,17 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/compile_et.c,v 1.6 2001/07/12 19:58:32 shadow Exp $"); #include #include --- 11,17 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/compile_et.c,v 1.6.4.1 2001/09/19 22:40:30 shadow Exp $"); #include #include *************** *** 133,138 **** --- 133,139 ---- char const * const *cpp; int got_language = 0; char *got_include = 0; + char lcname[6]; #ifdef AFS_AIX32_ENV /* *************** *** 364,369 **** --- 365,378 ---- table_name, table_name); fprintf (hfile, "#define %s_err_base ERROR_TABLE_BASE_%s\n", table_name, table_name); + fprintf (hfile, "\n/* for compatibility with other users... */\n"); + lcstring (lcname, table_name, sizeof(lcname)); + fprintf (hfile, "#define ERROR_TABLE_BASE_%s (%ldL)\n", + lcname, (long int) table_number); + fprintf (hfile, "#define init_%s_err_tbl initialize_%s_error_table\n", + lcname, lcname); + fprintf (hfile, "#define %s_err_base ERROR_TABLE_BASE_%s\n", lcname, + lcname); fclose(hfile); /* bye bye include file */ if (use_msf) fclose(msfile); Index: openafs/src/comerr/error_table.y diff -c openafs/src/comerr/error_table.y:1.4 openafs/src/comerr/error_table.y:1.4.4.1 *** openafs/src/comerr/error_table.y:1.4 Thu Jul 12 15:58:32 2001 --- openafs/src/comerr/error_table.y Wed Sep 19 18:40:30 2001 *************** *** 2,8 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/error_table.y,v 1.4 2001/07/12 19:58:32 shadow Exp $"); /* * --- 2,8 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/error_table.y,v 1.4.4.1 2001/09/19 22:40:30 shadow Exp $"); /* * *************** *** 276,284 **** } void set_table_num(char *string) ! { char ucname[6]; /* I think 5 is enough but et_name.c used 6... */ ! extern char *ucstring(); ! if (msfile) { set_table_1num(string); return; --- 276,282 ---- } void set_table_num(char *string) ! { if (msfile) { set_table_1num(string); return; *************** *** 289,295 **** string[4] = '\0'; fprintf(stderr, "to %s\n", string); } - string = ucstring (ucname, string, sizeof(ucname)); if (char_to_num (string[0]) > char_to_num ('z')) { fprintf (stderr, "%s%s%s%s", "First character of error table name must be ", --- 287,292 ---- Index: openafs/src/comerr/error_table_nt.c diff -c openafs/src/comerr/error_table_nt.c:1.3 openafs/src/comerr/error_table_nt.c:1.3.4.1 *** openafs/src/comerr/error_table_nt.c:1.3 Thu Jul 12 15:58:32 2001 --- openafs/src/comerr/error_table_nt.c Wed Sep 19 18:40:30 2001 *************** *** 1,1233 **** ! ! /* A Bison parser, made from error_table.y with Bison version GNU Bison version 1.24 ! */ ! ! #define YYBISON 1 /* Identify Bison output. */ ! ! #define ERROR_TABLE 258 ! #define ERROR_CODE_ENTRY 259 ! #define END 260 ! #define STRING 261 ! #define QUOTED_STRING 262 ! ! #line 1 "error_table.y" ! #include ! #include ! ! RCSID("$Header: /data/cvs/openafs/src/comerr/error_table_nt.c,v 1.3 2001/07/12 19:58:32 shadow Exp $"); ! ! ! /* ! * If __STDC__ is defined, function prototypes in the SunOS 5.5.1 lex ! * and yacc templates are visible. We turn this on explicitly on ! * NT because the prototypes help supress certain warning from the ! * Microsoft C compiler. ! */ ! ! #ifdef AFS_NT40_ENV ! #include ! # ifndef __STDC__ ! # define __STDC__ 1 ! # endif ! #endif ! ! #include ! #include ! #include ! ! #include "internal.h" ! ! char *current_token = (char *)NULL; ! extern char *table_name; ! ! char *ds(const char *string); ! char *quote(const char *string); ! void set_table_1num(char *string); ! int char_to_1num(char c); ! void add_ec(const char *name, const char *description); ! void add_ec_val(const char *name, const char *val, const char *description); ! void put_ecs(void); ! void set_table_num(char *string); ! void set_table_fun(char *astring); ! ! ! #line 38 "error_table.y" ! typedef union { ! char *dynstr; ! } YYSTYPE; ! #line 45 "error_table.y" ! ! ! #ifndef YYLTYPE ! typedef ! struct yyltype ! { ! int timestamp; ! int first_line; ! int first_column; ! int last_line; ! int last_column; ! char *text; ! } ! yyltype; ! ! #define YYLTYPE yyltype ! #endif ! ! #include ! ! #ifndef __cplusplus ! #ifndef __STDC__ ! #define const ! #endif ! #endif ! ! ! ! #define YYFINAL 24 ! #define YYFLAG -32768 ! #define YYNTBASE 10 ! ! #define YYTRANSLATE(x) ((unsigned)(x) <= 262 ? yytranslate[x] : 18) ! ! static const char yytranslate[] = { 0, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, ! 6, 7 ! }; ! ! #if YYDEBUG != 0 ! static const short yyprhs[] = { 0, ! 0, 5, 8, 10, 12, 14, 17, 19, 24, 31, ! 33 ! }; ! ! static const short yyrhs[] = { 3, ! 11, 14, 5, 0, 12, 13, 0, 13, 0, 6, ! 0, 6, 0, 14, 15, 0, 15, 0, 4, 16, ! 8, 17, 0, 4, 16, 9, 6, 8, 17, 0, ! 6, 0, 7, 0 ! }; ! ! #endif ! ! #if YYDEBUG != 0 ! static const short yyrline[] = { 0, ! 50, 56, 59, 66, 73, 79, 80, 83, 87, 95, ! 100 ! }; ! ! static const char * const yytname[] = { "$","error","$undefined.","ERROR_TABLE", ! "ERROR_CODE_ENTRY","END","STRING","QUOTED_STRING","','","'='","error_table", ! "header","table_fun","table_id","error_codes","ec_entry","ec_name","description", ! "" ! }; ! #endif ! ! static const short yyr1[] = { 0, ! 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, ! 17 ! }; ! ! static const short yyr2[] = { 0, ! 4, 2, 1, 1, 1, 2, 1, 4, 6, 1, ! 1 ! }; ! ! static const short yydefact[] = { 0, ! 0, 4, 0, 0, 3, 0, 0, 7, 5, 2, ! 10, 0, 1, 6, 0, 0, 11, 8, 0, 0, ! 9, 0, 0, 0 ! }; ! ! static const short yydefgoto[] = { 22, ! 3, 4, 5, 7, 8, 12, 18 ! }; ! ! static const short yypact[] = { 1, ! -1, 2, 3, 4,-32768, 5, -4,-32768,-32768,-32768, ! -32768, -6,-32768,-32768, 6, 8,-32768,-32768, 0, 6, ! -32768, 9, 12,-32768 ! }; ! ! static const short yypgoto[] = {-32768, ! -32768,-32768, 11,-32768, 10,-32768, -2 ! }; ! ! ! #define YYLAST 18 ! ! ! static const short yytable[] = { 6, ! 13, 15, 16, 1, 2, -5, 6, 20, 23, 9, ! 11, 24, 17, 19, 10, 0, 14, 21 ! }; ! ! static const short yycheck[] = { 4, ! 5, 8, 9, 3, 6, 4, 4, 8, 0, 6, ! 6, 0, 7, 6, 4, -1, 7, 20 ! }; ! /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ ! #line 3 "bison.simple" ! ! /* Skeleton output parser for bison, ! Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ ! ! /* As a special exception, when this file is copied by Bison into a ! Bison output file, you may use that output file without restriction. ! This special exception was added by the Free Software Foundation ! in version 1.24 of Bison. */ ! ! #ifndef alloca ! #ifdef __GNUC__ ! #define alloca __builtin_alloca ! #else /* not GNU C. */ ! #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) ! #include ! #else /* not sparc */ ! #if defined (MSDOS) && !defined (__TURBOC__) ! #include ! #else /* not MSDOS, or __TURBOC__ */ ! #if defined(_AIX) ! #include ! #pragma alloca ! #else /* not MSDOS, __TURBOC__, or _AIX */ ! #ifdef __hpux ! #ifdef __cplusplus ! extern "C" { ! void *alloca (unsigned int); ! }; ! #else /* not __cplusplus */ ! void *alloca (); ! #endif /* not __cplusplus */ ! #endif /* __hpux */ ! #endif /* not _AIX */ ! #endif /* not MSDOS, or __TURBOC__ */ ! #endif /* not sparc. */ ! #endif /* not GNU C. */ ! #endif /* alloca not defined. */ ! ! /* This is the parser code that is written into each bison parser ! when the %semantic_parser declaration is not specified in the grammar. ! It was written by Richard Stallman by simplifying the hairy parser ! used when %semantic_parser is specified. */ ! ! /* Note: there must be only one dollar sign in this file. ! It is replaced by the list of actions, each action ! as one case of the switch. */ ! ! #define yyerrok (yyerrstatus = 0) ! #define yyclearin (yychar = YYEMPTY) ! #define YYEMPTY -2 ! #define YYEOF 0 ! #define YYACCEPT return(0) ! #define YYABORT return(1) ! #define YYERROR goto yyerrlab1 ! /* Like YYERROR except do call yyerror. ! This remains here temporarily to ease the ! transition to the new meaning of YYERROR, for GCC. ! Once GCC version 2 has supplanted version 1, this can go. */ ! #define YYFAIL goto yyerrlab ! #define YYRECOVERING() (!!yyerrstatus) ! #define YYBACKUP(token, value) \ ! do \ ! if (yychar == YYEMPTY && yylen == 1) \ ! { yychar = (token), yylval = (value); \ ! yychar1 = YYTRANSLATE (yychar); \ ! YYPOPSTACK; \ ! goto yybackup; \ ! } \ ! else \ ! { yyerror ("syntax error: cannot back up"); YYERROR; } \ ! while (0) ! ! #define YYTERROR 1 ! #define YYERRCODE 256 ! ! #ifndef YYPURE ! #define YYLEX yylex() ! #endif ! ! #ifdef YYPURE ! #ifdef YYLSP_NEEDED ! #ifdef YYLEX_PARAM ! #define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) ! #else ! #define YYLEX yylex(&yylval, &yylloc) ! #endif ! #else /* not YYLSP_NEEDED */ ! #ifdef YYLEX_PARAM ! #define YYLEX yylex(&yylval, YYLEX_PARAM) ! #else ! #define YYLEX yylex(&yylval) ! #endif ! #endif /* not YYLSP_NEEDED */ ! #endif ! ! /* If nonreentrant, generate the variables here */ ! ! #ifndef YYPURE ! ! int yychar; /* the lookahead symbol */ ! YYSTYPE yylval; /* the semantic value of the */ ! /* lookahead symbol */ ! ! #ifdef YYLSP_NEEDED ! YYLTYPE yylloc; /* location data for the lookahead */ ! /* symbol */ ! #endif ! ! int yynerrs; /* number of parse errors so far */ ! #endif /* not YYPURE */ ! ! #if YYDEBUG != 0 ! int yydebug; /* nonzero means print parse trace */ ! /* Since this is uninitialized, it does not stop multiple parsers ! from coexisting. */ ! #endif ! ! /* YYINITDEPTH indicates the initial size of the parser's stacks */ ! ! #ifndef YYINITDEPTH ! #define YYINITDEPTH 200 ! #endif ! ! /* YYMAXDEPTH is the maximum size the stacks can grow to ! (effective only if the built-in stack extension method is used). */ ! ! #if YYMAXDEPTH == 0 ! #undef YYMAXDEPTH ! #endif ! ! #ifndef YYMAXDEPTH ! #define YYMAXDEPTH 10000 ! #endif ! ! /* Prevent warning if -Wstrict-prototypes. */ ! #ifdef __GNUC__ ! int yyparse (void); ! #endif ! ! #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ ! #define __yy_memcpy(FROM,TO,COUNT) __builtin_memcpy(TO,FROM,COUNT) ! #else /* not GNU C or C++ */ ! #ifndef __cplusplus ! ! /* This is the most reliable way to avoid incompatibilities ! in available built-in functions on various systems. */ ! static void ! __yy_memcpy (from, to, count) ! char *from; ! char *to; ! int count; ! { ! register char *f = from; ! register char *t = to; ! register int i = count; ! ! while (i-- > 0) ! *t++ = *f++; ! } ! ! #else /* __cplusplus */ ! ! /* This is the most reliable way to avoid incompatibilities ! in available built-in functions on various systems. */ ! static void ! __yy_memcpy (char *from, char *to, int count) ! { ! register char *f = from; ! register char *t = to; ! register int i = count; ! ! while (i-- > 0) ! *t++ = *f++; ! } ! ! #endif ! #endif ! ! #line 192 "bison.simple" ! ! /* The user can define YYPARSE_PARAM as the name of an argument to be passed ! into yyparse. The argument should have type void *. ! It should actually point to an object. ! Grammar actions can access the variable by casting it ! to the proper pointer type. */ ! ! #ifdef YYPARSE_PARAM ! #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; ! #else ! #define YYPARSE_PARAM ! #define YYPARSE_PARAM_DECL ! #endif ! ! int ! yyparse(YYPARSE_PARAM) ! YYPARSE_PARAM_DECL ! { ! register int yystate; ! register int yyn; ! register short *yyssp; ! register YYSTYPE *yyvsp; ! int yyerrstatus; /* number of tokens to shift before error messages enabled */ ! int yychar1 = 0; /* lookahead token as an internal (translated) token number */ ! ! short yyssa[YYINITDEPTH]; /* the state stack */ ! YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ ! ! short *yyss = yyssa; /* refer to the stacks thru separate pointers */ ! YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ ! ! #ifdef YYLSP_NEEDED ! YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ ! YYLTYPE *yyls = yylsa; ! YYLTYPE *yylsp; ! ! #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) ! #else ! #define YYPOPSTACK (yyvsp--, yyssp--) ! #endif ! ! int yystacksize = YYINITDEPTH; ! ! #ifdef YYPURE ! int yychar; ! YYSTYPE yylval; ! int yynerrs; ! #ifdef YYLSP_NEEDED ! YYLTYPE yylloc; ! #endif ! #endif ! ! YYSTYPE yyval; /* the variable used to return */ ! /* semantic values from the action */ ! /* routines */ ! ! int yylen; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Starting parse\n"); ! #endif ! ! yystate = 0; ! yyerrstatus = 0; ! yynerrs = 0; ! yychar = YYEMPTY; /* Cause a token to be read. */ ! ! /* Initialize stack pointers. ! Waste one element of value and location stack ! so that they stay on the same level as the state stack. ! The wasted elements are never initialized. */ ! ! yyssp = yyss - 1; ! yyvsp = yyvs; ! #ifdef YYLSP_NEEDED ! yylsp = yyls; ! #endif ! ! /* Push a new state, which is found in yystate . */ ! /* In all cases, when you get here, the value and location stacks ! have just been pushed. so pushing a state here evens the stacks. */ ! yynewstate: ! ! *++yyssp = yystate; ! ! if (yyssp >= yyss + yystacksize - 1) ! { ! /* Give user a chance to reallocate the stack */ ! /* Use copies of these so that the &'s don't force the real ones into memory. */ ! YYSTYPE *yyvs1 = yyvs; ! short *yyss1 = yyss; ! #ifdef YYLSP_NEEDED ! YYLTYPE *yyls1 = yyls; ! #endif ! ! /* Get the current used size of the three stacks, in elements. */ ! int size = yyssp - yyss + 1; ! ! #ifdef yyoverflow ! /* Each stack pointer address is followed by the size of ! the data in use in that stack, in bytes. */ ! #ifdef YYLSP_NEEDED ! /* This used to be a conditional around just the two extra args, ! but that might be undefined if yyoverflow is a macro. */ ! yyoverflow("parser stack overflow", ! &yyss1, size * sizeof (*yyssp), ! &yyvs1, size * sizeof (*yyvsp), ! &yyls1, size * sizeof (*yylsp), ! &yystacksize); ! #else ! yyoverflow("parser stack overflow", ! &yyss1, size * sizeof (*yyssp), ! &yyvs1, size * sizeof (*yyvsp), ! &yystacksize); ! #endif ! ! yyss = yyss1; yyvs = yyvs1; ! #ifdef YYLSP_NEEDED ! yyls = yyls1; ! #endif ! #else /* no yyoverflow */ ! /* Extend the stack our own way. */ ! if (yystacksize >= YYMAXDEPTH) ! { ! yyerror("parser stack overflow"); ! return 2; ! } ! yystacksize *= 2; ! if (yystacksize > YYMAXDEPTH) ! yystacksize = YYMAXDEPTH; ! yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); ! __yy_memcpy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp)); ! yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); ! __yy_memcpy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp)); ! #ifdef YYLSP_NEEDED ! yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); ! __yy_memcpy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp)); ! #endif ! #endif /* no yyoverflow */ ! ! yyssp = yyss + size - 1; ! yyvsp = yyvs + size - 1; ! #ifdef YYLSP_NEEDED ! yylsp = yyls + size - 1; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Stack size increased to %d\n", yystacksize); ! #endif ! ! if (yyssp >= yyss + yystacksize - 1) ! YYABORT; ! } ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Entering state %d\n", yystate); ! #endif ! ! goto yybackup; ! yybackup: ! ! /* Do appropriate processing given the current state. */ ! /* Read a lookahead token if we need one and don't already have one. */ ! /* yyresume: */ ! ! /* First try to decide what to do without reference to lookahead token. */ ! ! yyn = yypact[yystate]; ! if (yyn == YYFLAG) ! goto yydefault; ! ! /* Not known => get a lookahead token if don't already have one. */ ! ! /* yychar is either YYEMPTY or YYEOF ! or a valid token in external form. */ ! ! if (yychar == YYEMPTY) ! { ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Reading a token: "); ! #endif ! yychar = YYLEX; ! } ! ! /* Convert token to internal form (in yychar1) for indexing tables with */ ! ! if (yychar <= 0) /* This means end of input. */ ! { ! yychar1 = 0; ! yychar = YYEOF; /* Don't call YYLEX any more */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Now at end of input.\n"); ! #endif ! } ! else ! { ! yychar1 = YYTRANSLATE(yychar); ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); ! /* Give the individual parser a way to print the precise meaning ! of a token, for further debugging info. */ ! #ifdef YYPRINT ! YYPRINT (stderr, yychar, yylval); ! #endif ! fprintf (stderr, ")\n"); ! } ! #endif ! } ! ! yyn += yychar1; ! if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) ! goto yydefault; ! ! yyn = yytable[yyn]; ! ! /* yyn is what to do for this token type in this state. ! Negative => reduce, -yyn is rule number. ! Positive => shift, yyn is new state. ! New state is final state => don't bother to shift, ! just return success. ! 0, or most negative number => error. */ ! ! if (yyn < 0) ! { ! if (yyn == YYFLAG) ! goto yyerrlab; ! yyn = -yyn; ! goto yyreduce; ! } ! else if (yyn == 0) ! goto yyerrlab; ! ! if (yyn == YYFINAL) ! YYACCEPT; ! ! /* Shift the lookahead token. */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); ! #endif ! ! /* Discard the token being shifted unless it is eof. */ ! if (yychar != YYEOF) ! yychar = YYEMPTY; ! ! *++yyvsp = yylval; ! #ifdef YYLSP_NEEDED ! *++yylsp = yylloc; ! #endif ! ! /* count tokens shifted since error; after three, turn off error status. */ ! if (yyerrstatus) yyerrstatus--; ! ! yystate = yyn; ! goto yynewstate; ! ! /* Do the default action for the current state. */ ! yydefault: ! ! yyn = yydefact[yystate]; ! if (yyn == 0) ! goto yyerrlab; ! ! /* Do a reduction. yyn is the number of a rule to reduce with. */ ! yyreduce: ! yylen = yyr2[yyn]; ! if (yylen > 0) ! yyval = yyvsp[1-yylen]; /* implement default value of the action */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! int i; ! ! fprintf (stderr, "Reducing via rule %d (line %d), ", ! yyn, yyrline[yyn]); ! ! /* Print the symbols being reduced, and their result. */ ! for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) ! fprintf (stderr, "%s ", yytname[yyrhs[i]]); ! fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); ! } ! #endif ! ! ! switch (yyn) { ! ! case 1: ! #line 51 "error_table.y" ! { table_name = ds(yyvsp[-2].dynstr); ! current_token = table_name; ! put_ecs(); ; ! break;} ! case 2: ! #line 57 "error_table.y" ! { current_token = yyvsp[-1].dynstr; ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 3: ! #line 60 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_fun(ds("1")); ! yyval.dynstr = yyvsp[0].dynstr; ! ; ! break;} ! case 4: ! #line 67 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_fun(yyvsp[0].dynstr); ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 5: ! #line 74 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_num(yyvsp[0].dynstr); ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 8: ! #line 84 "error_table.y" ! { add_ec(yyvsp[-2].dynstr, yyvsp[0].dynstr); ! free(yyvsp[-2].dynstr); ! free(yyvsp[0].dynstr); ; ! break;} ! case 9: ! #line 88 "error_table.y" ! { add_ec_val(yyvsp[-4].dynstr, yyvsp[-2].dynstr, yyvsp[0].dynstr); ! free(yyvsp[-4].dynstr); ! free(yyvsp[-2].dynstr); ! free(yyvsp[0].dynstr); ! ; ! break;} ! case 10: ! #line 96 "error_table.y" ! { yyval.dynstr = ds(yyvsp[0].dynstr); ! current_token = yyval.dynstr; ; ! break;} ! case 11: ! #line 101 "error_table.y" ! { yyval.dynstr = ds(yyvsp[0].dynstr); ! current_token = yyval.dynstr; ; ! break;} ! } ! /* the action file gets copied in in place of this dollarsign */ ! #line 487 "bison.simple" ! ! yyvsp -= yylen; ! yyssp -= yylen; ! #ifdef YYLSP_NEEDED ! yylsp -= yylen; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! short *ssp1 = yyss - 1; ! fprintf (stderr, "state stack now"); ! while (ssp1 != yyssp) ! fprintf (stderr, " %d", *++ssp1); ! fprintf (stderr, "\n"); ! } ! #endif ! ! *++yyvsp = yyval; ! ! #ifdef YYLSP_NEEDED ! yylsp++; ! if (yylen == 0) ! { ! yylsp->first_line = yylloc.first_line; ! yylsp->first_column = yylloc.first_column; ! yylsp->last_line = (yylsp-1)->last_line; ! yylsp->last_column = (yylsp-1)->last_column; ! yylsp->text = 0; ! } ! else ! { ! yylsp->last_line = (yylsp+yylen-1)->last_line; ! yylsp->last_column = (yylsp+yylen-1)->last_column; ! } ! #endif ! ! /* Now "shift" the result of the reduction. ! Determine what state that goes to, ! based on the state we popped back to ! and the rule number reduced by. */ ! ! yyn = yyr1[yyn]; ! ! yystate = yypgoto[yyn - YYNTBASE] + *yyssp; ! if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) ! yystate = yytable[yystate]; ! else ! yystate = yydefgoto[yyn - YYNTBASE]; ! ! goto yynewstate; ! ! yyerrlab: /* here on detecting error */ ! ! if (! yyerrstatus) ! /* If not already recovering from an error, report this error. */ ! { ! ++yynerrs; ! ! #ifdef YYERROR_VERBOSE ! yyn = yypact[yystate]; ! ! if (yyn > YYFLAG && yyn < YYLAST) ! { ! int size = 0; ! char *msg; ! int x, count; ! ! count = 0; ! /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ ! for (x = (yyn < 0 ? -yyn : 0); ! x < (sizeof(yytname) / sizeof(char *)); x++) ! if (yycheck[x + yyn] == x) ! size += strlen(yytname[x]) + 15, count++; ! msg = (char *) malloc(size + 15); ! if (msg != 0) ! { ! strcpy(msg, "parse error"); ! ! if (count < 5) ! { ! count = 0; ! for (x = (yyn < 0 ? -yyn : 0); ! x < (sizeof(yytname) / sizeof(char *)); x++) ! if (yycheck[x + yyn] == x) ! { ! strcat(msg, count == 0 ? ", expecting `" : " or `"); ! strcat(msg, yytname[x]); ! strcat(msg, "'"); ! count++; ! } ! } ! yyerror(msg); ! free(msg); ! } ! else ! yyerror ("parse error; also virtual memory exceeded"); ! } ! else ! #endif /* YYERROR_VERBOSE */ ! yyerror("parse error"); ! } ! ! goto yyerrlab1; ! yyerrlab1: /* here on error raised explicitly by an action */ ! ! if (yyerrstatus == 3) ! { ! /* if just tried and failed to reuse lookahead token after an error, discard it. */ ! ! /* return failure if at end of input */ ! if (yychar == YYEOF) ! YYABORT; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); ! #endif ! ! yychar = YYEMPTY; ! } ! ! /* Else will try to reuse lookahead token ! after shifting the error token. */ ! ! yyerrstatus = 3; /* Each real token shifted decrements this */ ! ! goto yyerrhandle; ! ! yyerrdefault: /* current state does not do anything special for the error token. */ ! ! #if 0 ! /* This is wrong; only states that explicitly want error tokens ! should shift them. */ ! yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ ! if (yyn) goto yydefault; ! #endif ! ! yyerrpop: /* pop the current state because it cannot handle the error token */ ! ! if (yyssp == yyss) YYABORT; ! yyvsp--; ! yystate = *--yyssp; ! #ifdef YYLSP_NEEDED ! yylsp--; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! short *ssp1 = yyss - 1; ! fprintf (stderr, "Error: state stack now"); ! while (ssp1 != yyssp) ! fprintf (stderr, " %d", *++ssp1); ! fprintf (stderr, "\n"); ! } ! #endif ! ! yyerrhandle: ! ! yyn = yypact[yystate]; ! if (yyn == YYFLAG) ! goto yyerrdefault; ! ! yyn += YYTERROR; ! if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) ! goto yyerrdefault; ! ! yyn = yytable[yyn]; ! if (yyn < 0) ! { ! if (yyn == YYFLAG) ! goto yyerrpop; ! yyn = -yyn; ! goto yyreduce; ! } ! else if (yyn == 0) ! goto yyerrpop; ! ! if (yyn == YYFINAL) ! YYACCEPT; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Shifting error token, "); ! #endif ! ! *++yyvsp = yylval; ! #ifdef YYLSP_NEEDED ! *++yylsp = yylloc; ! #endif ! ! yystate = yyn; ! goto yynewstate; ! } ! #line 105 "error_table.y" ! ! /* ! * ! * Copyright 1986, 1987 by the MIT Student Information Processing Board ! * ! * For copyright info, see mit-sipb-cr.h. ! */ ! #ifndef AFS_NT40_ENV ! #include ! #endif ! #include ! #include ! #include ! #include ! #ifdef AFS_NT40_ENV ! #include ! #include ! #else ! #include ! #endif ! #include ! #include "error_table.h" ! #include "mit-sipb-cr.h" ! #include ! ! /* Copyright (C) 1998 Transarc Corporation. All rights reserved. ! * ! */ ! ! extern FILE *hfile, *cfile, *msfile; ! extern int use_msf; ! ! static afs_int32 gensym_n = 0; ! ! char *gensym(const char *x) ! { ! char *symbol; ! if (!gensym_n) { ! struct timeval tv; ! gettimeofday(&tv, (void *)0); ! gensym_n = (tv.tv_sec%10000)*100 + tv.tv_usec/10000; ! } ! symbol = (char *)malloc(32 * sizeof(char)); ! gensym_n++; ! sprintf(symbol, "et%ld", gensym_n); ! return(symbol); ! } ! ! char * ! ds(const char *string) ! { ! char *rv; ! rv = (char *)malloc(strlen(string)+1); ! strcpy(rv, string); ! return(rv); ! } ! ! char * ! quote(const char *string) ! { ! char *rv; ! rv = (char *)malloc(strlen(string)+3); ! strcpy(rv, "\""); ! strcat(rv, string); ! strcat(rv, "\""); ! return(rv); ! } ! ! afs_int32 table_number = 0; ! int current = 0; ! char **error_codes = (char **)NULL; ! ! void add_ec(const char *name, const char *description) ! { ! if (msfile) { ! if (current > 0) ! #ifndef sun ! fprintf(msfile, "%d\t%s\n", current, description); ! #else ! fprintf(msfile, "%d %s\n", current, description); ! #endif /* !sun */ ! } else { ! fprintf(cfile, "\t\"%s\",\n", description); ! } ! if (error_codes == (char **)NULL) { ! error_codes = (char **)malloc(sizeof(char *)); ! *error_codes = (char *)NULL; ! } ! error_codes = (char **)realloc((char *)error_codes, ! (current + 2)*sizeof(char *)); ! error_codes[current++] = ds(name); ! error_codes[current] = (char *)NULL; ! } ! ! void add_ec_val(const char *name, const char *val, const char *description) ! { ! const int ncurrent = atoi(val); ! if (ncurrent < current) { ! printf("Error code %s (%d) out of order", name, ! current); ! return; ! } ! ! while (ncurrent > current) { ! if (!msfile) ! fputs("\t(char *)NULL,\n", cfile); ! current++; ! } ! if (msfile) { ! if (current > 0) ! #ifndef sun ! fprintf(msfile, "%d\t%s\n", current, description); ! #else ! fprintf(msfile, "%d %s\n", current, description); ! #endif /* ! sun */ ! } else { ! fprintf(cfile, "\t\"%s\",\n", description); ! } ! if (error_codes == (char **)NULL) { ! error_codes = (char **)malloc(sizeof(char *)); ! *error_codes = (char *)NULL; ! } ! error_codes = (char **)realloc((char *)error_codes, ! (current + 2)*sizeof(char *)); ! error_codes[current++] = ds(name); ! error_codes[current] = (char *)NULL; ! } ! ! void put_ecs(void) ! { ! int i; ! for (i = 0; i < current; i++) { ! if (error_codes[i] != (char *)NULL) ! fprintf(hfile, "#define %-40s (%ldL)\n", ! error_codes[i], table_number + i); ! } ! } ! ! /* ! * char_to_num -- maps letters and numbers into a small numbering space ! * uppercase -> 1-26 ! * lowercase -> 27-52 ! * digits -> 53-62 ! * underscore-> 63 ! */ ! ! static const char char_set[] = ! "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"; ! ! int char_to_num(char c) ! { ! const char *where; ! int diff; ! ! where = strchr (char_set, c); ! if (where) { ! diff = where - char_set + 1; ! assert (diff < (1 << ERRCODE_RANGE)); ! return diff; ! } ! else if (isprint (c)) ! fprintf (stderr, ! "Illegal character `%c' in error table name\n", ! c); ! else ! fprintf (stderr, ! "Illegal character %03o in error table name\n", ! c); ! exit (1); ! } ! ! void set_table_num(char *string) ! { char ucname[6]; /* I think 5 is enough but et_name.c used 6... */ ! extern char *ucstring(); ! ! if (msfile) { ! set_table_1num(string); ! return; ! } ! if (strlen(string) > 4) { ! fprintf(stderr, "Table name %s too long, truncated ", ! string); ! string[4] = '\0'; ! fprintf(stderr, "to %s\n", string); ! } ! string = ucstring (ucname, string, sizeof(ucname)); ! if (char_to_num (string[0]) > char_to_num ('z')) { ! fprintf (stderr, "%s%s%s%s", ! "First character of error table name must be ", ! "a letter; name ``", ! string, "'' rejected\n"); ! exit (1); ! } ! while (*string != '\0') { ! table_number = (table_number << BITS_PER_CHAR) ! + char_to_num(*string); ! string++; ! } ! table_number = table_number << ERRCODE_RANGE; ! } ! ! void set_table_fun(char *astring) ! { ! register char *tp; ! unsigned int tc; ! ! for(tp=astring; (tc = *tp) != 0; tp++) { ! if (!isdigit(tc)) { ! fprintf(stderr, "Table function '%s' must be a decimal integer.\n", ! astring); ! exit(1); ! } ! } ! if (msfile) ! table_number += (atoi(astring)) << 28; ! } ! ! /* for compatibility with old comerr's, we truncate package name to 4 ! * characters, but only store first 3 in the error code. Note that this ! * function, as a side effect, truncates the table name down to 4 chars. ! */ ! void set_table_1num(char *string) ! { ! afs_int32 temp; ! int ctr; ! ! if ((temp = strlen(string)) > 4) { ! fprintf(stderr, "Table name %s too long, truncated ", ! string); ! string[4] = '\0'; ! fprintf(stderr, "to %s\n", string); ! } ! if (temp == 4) { ! fprintf(stderr, "Table name %s too long, only 3 characters fit in error code.\n", ! string); ! } ! if (char_to_1num (string[0]) > char_to_1num ('z')) { ! fprintf (stderr, "%s%s%s%s", ! "First character of error table name must be ", ! "a letter; name ``", ! string, "'' rejected\n"); ! exit (1); ! } ! temp = 0; ! for(ctr=0; ctr < 3; ctr++) { /* copy at most 3 chars to integer */ ! if (*string == '\0') break; /* and watch for early end */ ! temp = (temp * 050) /* "radix fifty" is base 050 = 40 */ ! + char_to_1num(*string); ! string++; ! } ! table_number += temp << 12; ! } ! ! /* ! * char_to_num -- maps letters and numbers into very small space ! * 0-9 -> 0-9 ! * mixed case -> 10-35 ! * _ -> 36 ! * others are reserved ! */ ! ! static const char char_1set[] = ! "abcdefghijklmnopqrstuvwxyz_0123456789"; ! ! int char_to_1num(char c) ! { ! const char *where; ! int diff; ! ! if (isupper(c)) c = tolower(c); ! ! where = strchr (char_1set, c); ! if (where) { ! /* start at 1 so we can decode */ ! diff = where - char_1set; ! assert (diff < 050); /* it is radix 50, after all */ ! return diff; ! } ! else if (isprint (c)) ! fprintf (stderr, ! "Illegal character `%c' in error table name\n", ! c); ! else ! fprintf (stderr, ! "Illegal character %03o in error table name\n", ! c); ! exit (1); ! } ! ! #ifdef AFS_NT40_ENV ! #include "et_lex.lex_nt.c" ! #else ! #include "et_lex.lex.c" ! #endif --- 1,1230 ---- ! ! /* A Bison parser, made from error_table.y with Bison version GNU Bison version 1.24 ! */ ! ! #define YYBISON 1 /* Identify Bison output. */ ! ! #define ERROR_TABLE 258 ! #define ERROR_CODE_ENTRY 259 ! #define END 260 ! #define STRING 261 ! #define QUOTED_STRING 262 ! ! #line 1 "error_table.y" ! #include ! #include ! ! RCSID("$Header: /data/cvs/openafs/src/comerr/error_table_nt.c,v 1.3.4.1 2001/09/19 22:40:30 shadow Exp $"); ! ! ! /* ! * If __STDC__ is defined, function prototypes in the SunOS 5.5.1 lex ! * and yacc templates are visible. We turn this on explicitly on ! * NT because the prototypes help supress certain warning from the ! * Microsoft C compiler. ! */ ! ! #ifdef AFS_NT40_ENV ! #include ! # ifndef __STDC__ ! # define __STDC__ 1 ! # endif ! #endif ! ! #include ! #include ! #include ! ! #include "internal.h" ! ! char *current_token = (char *)NULL; ! extern char *table_name; ! ! char *ds(const char *string); ! char *quote(const char *string); ! void set_table_1num(char *string); ! int char_to_1num(char c); ! void add_ec(const char *name, const char *description); ! void add_ec_val(const char *name, const char *val, const char *description); ! void put_ecs(void); ! void set_table_num(char *string); ! void set_table_fun(char *astring); ! ! ! #line 38 "error_table.y" ! typedef union { ! char *dynstr; ! } YYSTYPE; ! #line 45 "error_table.y" ! ! ! #ifndef YYLTYPE ! typedef ! struct yyltype ! { ! int timestamp; ! int first_line; ! int first_column; ! int last_line; ! int last_column; ! char *text; ! } ! yyltype; ! ! #define YYLTYPE yyltype ! #endif ! ! #include ! ! #ifndef __cplusplus ! #ifndef __STDC__ ! #define const ! #endif ! #endif ! ! ! ! #define YYFINAL 24 ! #define YYFLAG -32768 ! #define YYNTBASE 10 ! ! #define YYTRANSLATE(x) ((unsigned)(x) <= 262 ? yytranslate[x] : 18) ! ! static const char yytranslate[] = { 0, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 8, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 9, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ! 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, ! 6, 7 ! }; ! ! #if YYDEBUG != 0 ! static const short yyprhs[] = { 0, ! 0, 5, 8, 10, 12, 14, 17, 19, 24, 31, ! 33 ! }; ! ! static const short yyrhs[] = { 3, ! 11, 14, 5, 0, 12, 13, 0, 13, 0, 6, ! 0, 6, 0, 14, 15, 0, 15, 0, 4, 16, ! 8, 17, 0, 4, 16, 9, 6, 8, 17, 0, ! 6, 0, 7, 0 ! }; ! ! #endif ! ! #if YYDEBUG != 0 ! static const short yyrline[] = { 0, ! 50, 56, 59, 66, 73, 79, 80, 83, 87, 95, ! 100 ! }; ! ! static const char * const yytname[] = { "$","error","$undefined.","ERROR_TABLE", ! "ERROR_CODE_ENTRY","END","STRING","QUOTED_STRING","','","'='","error_table", ! "header","table_fun","table_id","error_codes","ec_entry","ec_name","description", ! "" ! }; ! #endif ! ! static const short yyr1[] = { 0, ! 10, 11, 11, 12, 13, 14, 14, 15, 15, 16, ! 17 ! }; ! ! static const short yyr2[] = { 0, ! 4, 2, 1, 1, 1, 2, 1, 4, 6, 1, ! 1 ! }; ! ! static const short yydefact[] = { 0, ! 0, 4, 0, 0, 3, 0, 0, 7, 5, 2, ! 10, 0, 1, 6, 0, 0, 11, 8, 0, 0, ! 9, 0, 0, 0 ! }; ! ! static const short yydefgoto[] = { 22, ! 3, 4, 5, 7, 8, 12, 18 ! }; ! ! static const short yypact[] = { 1, ! -1, 2, 3, 4,-32768, 5, -4,-32768,-32768,-32768, ! -32768, -6,-32768,-32768, 6, 8,-32768,-32768, 0, 6, ! -32768, 9, 12,-32768 ! }; ! ! static const short yypgoto[] = {-32768, ! -32768,-32768, 11,-32768, 10,-32768, -2 ! }; ! ! ! #define YYLAST 18 ! ! ! static const short yytable[] = { 6, ! 13, 15, 16, 1, 2, -5, 6, 20, 23, 9, ! 11, 24, 17, 19, 10, 0, 14, 21 ! }; ! ! static const short yycheck[] = { 4, ! 5, 8, 9, 3, 6, 4, 4, 8, 0, 6, ! 6, 0, 7, 6, 4, -1, 7, 20 ! }; ! /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ ! #line 3 "bison.simple" ! ! /* Skeleton output parser for bison, ! Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. ! ! This program is free software; you can redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2, or (at your option) ! any later version. ! ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ ! ! /* As a special exception, when this file is copied by Bison into a ! Bison output file, you may use that output file without restriction. ! This special exception was added by the Free Software Foundation ! in version 1.24 of Bison. */ ! ! #ifndef alloca ! #ifdef __GNUC__ ! #define alloca __builtin_alloca ! #else /* not GNU C. */ ! #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) ! #include ! #else /* not sparc */ ! #if defined (MSDOS) && !defined (__TURBOC__) ! #include ! #else /* not MSDOS, or __TURBOC__ */ ! #if defined(_AIX) ! #include ! #pragma alloca ! #else /* not MSDOS, __TURBOC__, or _AIX */ ! #ifdef __hpux ! #ifdef __cplusplus ! extern "C" { ! void *alloca (unsigned int); ! }; ! #else /* not __cplusplus */ ! void *alloca (); ! #endif /* not __cplusplus */ ! #endif /* __hpux */ ! #endif /* not _AIX */ ! #endif /* not MSDOS, or __TURBOC__ */ ! #endif /* not sparc. */ ! #endif /* not GNU C. */ ! #endif /* alloca not defined. */ ! ! /* This is the parser code that is written into each bison parser ! when the %semantic_parser declaration is not specified in the grammar. ! It was written by Richard Stallman by simplifying the hairy parser ! used when %semantic_parser is specified. */ ! ! /* Note: there must be only one dollar sign in this file. ! It is replaced by the list of actions, each action ! as one case of the switch. */ ! ! #define yyerrok (yyerrstatus = 0) ! #define yyclearin (yychar = YYEMPTY) ! #define YYEMPTY -2 ! #define YYEOF 0 ! #define YYACCEPT return(0) ! #define YYABORT return(1) ! #define YYERROR goto yyerrlab1 ! /* Like YYERROR except do call yyerror. ! This remains here temporarily to ease the ! transition to the new meaning of YYERROR, for GCC. ! Once GCC version 2 has supplanted version 1, this can go. */ ! #define YYFAIL goto yyerrlab ! #define YYRECOVERING() (!!yyerrstatus) ! #define YYBACKUP(token, value) \ ! do \ ! if (yychar == YYEMPTY && yylen == 1) \ ! { yychar = (token), yylval = (value); \ ! yychar1 = YYTRANSLATE (yychar); \ ! YYPOPSTACK; \ ! goto yybackup; \ ! } \ ! else \ ! { yyerror ("syntax error: cannot back up"); YYERROR; } \ ! while (0) ! ! #define YYTERROR 1 ! #define YYERRCODE 256 ! ! #ifndef YYPURE ! #define YYLEX yylex() ! #endif ! ! #ifdef YYPURE ! #ifdef YYLSP_NEEDED ! #ifdef YYLEX_PARAM ! #define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) ! #else ! #define YYLEX yylex(&yylval, &yylloc) ! #endif ! #else /* not YYLSP_NEEDED */ ! #ifdef YYLEX_PARAM ! #define YYLEX yylex(&yylval, YYLEX_PARAM) ! #else ! #define YYLEX yylex(&yylval) ! #endif ! #endif /* not YYLSP_NEEDED */ ! #endif ! ! /* If nonreentrant, generate the variables here */ ! ! #ifndef YYPURE ! ! int yychar; /* the lookahead symbol */ ! YYSTYPE yylval; /* the semantic value of the */ ! /* lookahead symbol */ ! ! #ifdef YYLSP_NEEDED ! YYLTYPE yylloc; /* location data for the lookahead */ ! /* symbol */ ! #endif ! ! int yynerrs; /* number of parse errors so far */ ! #endif /* not YYPURE */ ! ! #if YYDEBUG != 0 ! int yydebug; /* nonzero means print parse trace */ ! /* Since this is uninitialized, it does not stop multiple parsers ! from coexisting. */ ! #endif ! ! /* YYINITDEPTH indicates the initial size of the parser's stacks */ ! ! #ifndef YYINITDEPTH ! #define YYINITDEPTH 200 ! #endif ! ! /* YYMAXDEPTH is the maximum size the stacks can grow to ! (effective only if the built-in stack extension method is used). */ ! ! #if YYMAXDEPTH == 0 ! #undef YYMAXDEPTH ! #endif ! ! #ifndef YYMAXDEPTH ! #define YYMAXDEPTH 10000 ! #endif ! ! /* Prevent warning if -Wstrict-prototypes. */ ! #ifdef __GNUC__ ! int yyparse (void); ! #endif ! ! #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ ! #define __yy_memcpy(FROM,TO,COUNT) __builtin_memcpy(TO,FROM,COUNT) ! #else /* not GNU C or C++ */ ! #ifndef __cplusplus ! ! /* This is the most reliable way to avoid incompatibilities ! in available built-in functions on various systems. */ ! static void ! __yy_memcpy (from, to, count) ! char *from; ! char *to; ! int count; ! { ! register char *f = from; ! register char *t = to; ! register int i = count; ! ! while (i-- > 0) ! *t++ = *f++; ! } ! ! #else /* __cplusplus */ ! ! /* This is the most reliable way to avoid incompatibilities ! in available built-in functions on various systems. */ ! static void ! __yy_memcpy (char *from, char *to, int count) ! { ! register char *f = from; ! register char *t = to; ! register int i = count; ! ! while (i-- > 0) ! *t++ = *f++; ! } ! ! #endif ! #endif ! ! #line 192 "bison.simple" ! ! /* The user can define YYPARSE_PARAM as the name of an argument to be passed ! into yyparse. The argument should have type void *. ! It should actually point to an object. ! Grammar actions can access the variable by casting it ! to the proper pointer type. */ ! ! #ifdef YYPARSE_PARAM ! #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; ! #else ! #define YYPARSE_PARAM ! #define YYPARSE_PARAM_DECL ! #endif ! ! int ! yyparse(YYPARSE_PARAM) ! YYPARSE_PARAM_DECL ! { ! register int yystate; ! register int yyn; ! register short *yyssp; ! register YYSTYPE *yyvsp; ! int yyerrstatus; /* number of tokens to shift before error messages enabled */ ! int yychar1 = 0; /* lookahead token as an internal (translated) token number */ ! ! short yyssa[YYINITDEPTH]; /* the state stack */ ! YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ ! ! short *yyss = yyssa; /* refer to the stacks thru separate pointers */ ! YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ ! ! #ifdef YYLSP_NEEDED ! YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ ! YYLTYPE *yyls = yylsa; ! YYLTYPE *yylsp; ! ! #define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) ! #else ! #define YYPOPSTACK (yyvsp--, yyssp--) ! #endif ! ! int yystacksize = YYINITDEPTH; ! ! #ifdef YYPURE ! int yychar; ! YYSTYPE yylval; ! int yynerrs; ! #ifdef YYLSP_NEEDED ! YYLTYPE yylloc; ! #endif ! #endif ! ! YYSTYPE yyval; /* the variable used to return */ ! /* semantic values from the action */ ! /* routines */ ! ! int yylen; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Starting parse\n"); ! #endif ! ! yystate = 0; ! yyerrstatus = 0; ! yynerrs = 0; ! yychar = YYEMPTY; /* Cause a token to be read. */ ! ! /* Initialize stack pointers. ! Waste one element of value and location stack ! so that they stay on the same level as the state stack. ! The wasted elements are never initialized. */ ! ! yyssp = yyss - 1; ! yyvsp = yyvs; ! #ifdef YYLSP_NEEDED ! yylsp = yyls; ! #endif ! ! /* Push a new state, which is found in yystate . */ ! /* In all cases, when you get here, the value and location stacks ! have just been pushed. so pushing a state here evens the stacks. */ ! yynewstate: ! ! *++yyssp = yystate; ! ! if (yyssp >= yyss + yystacksize - 1) ! { ! /* Give user a chance to reallocate the stack */ ! /* Use copies of these so that the &'s don't force the real ones into memory. */ ! YYSTYPE *yyvs1 = yyvs; ! short *yyss1 = yyss; ! #ifdef YYLSP_NEEDED ! YYLTYPE *yyls1 = yyls; ! #endif ! ! /* Get the current used size of the three stacks, in elements. */ ! int size = yyssp - yyss + 1; ! ! #ifdef yyoverflow ! /* Each stack pointer address is followed by the size of ! the data in use in that stack, in bytes. */ ! #ifdef YYLSP_NEEDED ! /* This used to be a conditional around just the two extra args, ! but that might be undefined if yyoverflow is a macro. */ ! yyoverflow("parser stack overflow", ! &yyss1, size * sizeof (*yyssp), ! &yyvs1, size * sizeof (*yyvsp), ! &yyls1, size * sizeof (*yylsp), ! &yystacksize); ! #else ! yyoverflow("parser stack overflow", ! &yyss1, size * sizeof (*yyssp), ! &yyvs1, size * sizeof (*yyvsp), ! &yystacksize); ! #endif ! ! yyss = yyss1; yyvs = yyvs1; ! #ifdef YYLSP_NEEDED ! yyls = yyls1; ! #endif ! #else /* no yyoverflow */ ! /* Extend the stack our own way. */ ! if (yystacksize >= YYMAXDEPTH) ! { ! yyerror("parser stack overflow"); ! return 2; ! } ! yystacksize *= 2; ! if (yystacksize > YYMAXDEPTH) ! yystacksize = YYMAXDEPTH; ! yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); ! __yy_memcpy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp)); ! yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); ! __yy_memcpy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp)); ! #ifdef YYLSP_NEEDED ! yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); ! __yy_memcpy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp)); ! #endif ! #endif /* no yyoverflow */ ! ! yyssp = yyss + size - 1; ! yyvsp = yyvs + size - 1; ! #ifdef YYLSP_NEEDED ! yylsp = yyls + size - 1; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Stack size increased to %d\n", yystacksize); ! #endif ! ! if (yyssp >= yyss + yystacksize - 1) ! YYABORT; ! } ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Entering state %d\n", yystate); ! #endif ! ! goto yybackup; ! yybackup: ! ! /* Do appropriate processing given the current state. */ ! /* Read a lookahead token if we need one and don't already have one. */ ! /* yyresume: */ ! ! /* First try to decide what to do without reference to lookahead token. */ ! ! yyn = yypact[yystate]; ! if (yyn == YYFLAG) ! goto yydefault; ! ! /* Not known => get a lookahead token if don't already have one. */ ! ! /* yychar is either YYEMPTY or YYEOF ! or a valid token in external form. */ ! ! if (yychar == YYEMPTY) ! { ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Reading a token: "); ! #endif ! yychar = YYLEX; ! } ! ! /* Convert token to internal form (in yychar1) for indexing tables with */ ! ! if (yychar <= 0) /* This means end of input. */ ! { ! yychar1 = 0; ! yychar = YYEOF; /* Don't call YYLEX any more */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Now at end of input.\n"); ! #endif ! } ! else ! { ! yychar1 = YYTRANSLATE(yychar); ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); ! /* Give the individual parser a way to print the precise meaning ! of a token, for further debugging info. */ ! #ifdef YYPRINT ! YYPRINT (stderr, yychar, yylval); ! #endif ! fprintf (stderr, ")\n"); ! } ! #endif ! } ! ! yyn += yychar1; ! if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) ! goto yydefault; ! ! yyn = yytable[yyn]; ! ! /* yyn is what to do for this token type in this state. ! Negative => reduce, -yyn is rule number. ! Positive => shift, yyn is new state. ! New state is final state => don't bother to shift, ! just return success. ! 0, or most negative number => error. */ ! ! if (yyn < 0) ! { ! if (yyn == YYFLAG) ! goto yyerrlab; ! yyn = -yyn; ! goto yyreduce; ! } ! else if (yyn == 0) ! goto yyerrlab; ! ! if (yyn == YYFINAL) ! YYACCEPT; ! ! /* Shift the lookahead token. */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); ! #endif ! ! /* Discard the token being shifted unless it is eof. */ ! if (yychar != YYEOF) ! yychar = YYEMPTY; ! ! *++yyvsp = yylval; ! #ifdef YYLSP_NEEDED ! *++yylsp = yylloc; ! #endif ! ! /* count tokens shifted since error; after three, turn off error status. */ ! if (yyerrstatus) yyerrstatus--; ! ! yystate = yyn; ! goto yynewstate; ! ! /* Do the default action for the current state. */ ! yydefault: ! ! yyn = yydefact[yystate]; ! if (yyn == 0) ! goto yyerrlab; ! ! /* Do a reduction. yyn is the number of a rule to reduce with. */ ! yyreduce: ! yylen = yyr2[yyn]; ! if (yylen > 0) ! yyval = yyvsp[1-yylen]; /* implement default value of the action */ ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! int i; ! ! fprintf (stderr, "Reducing via rule %d (line %d), ", ! yyn, yyrline[yyn]); ! ! /* Print the symbols being reduced, and their result. */ ! for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) ! fprintf (stderr, "%s ", yytname[yyrhs[i]]); ! fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); ! } ! #endif ! ! ! switch (yyn) { ! ! case 1: ! #line 51 "error_table.y" ! { table_name = ds(yyvsp[-2].dynstr); ! current_token = table_name; ! put_ecs(); ; ! break;} ! case 2: ! #line 57 "error_table.y" ! { current_token = yyvsp[-1].dynstr; ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 3: ! #line 60 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_fun(ds("1")); ! yyval.dynstr = yyvsp[0].dynstr; ! ; ! break;} ! case 4: ! #line 67 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_fun(yyvsp[0].dynstr); ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 5: ! #line 74 "error_table.y" ! { current_token = yyvsp[0].dynstr; ! set_table_num(yyvsp[0].dynstr); ! yyval.dynstr = yyvsp[0].dynstr; ; ! break;} ! case 8: ! #line 84 "error_table.y" ! { add_ec(yyvsp[-2].dynstr, yyvsp[0].dynstr); ! free(yyvsp[-2].dynstr); ! free(yyvsp[0].dynstr); ; ! break;} ! case 9: ! #line 88 "error_table.y" ! { add_ec_val(yyvsp[-4].dynstr, yyvsp[-2].dynstr, yyvsp[0].dynstr); ! free(yyvsp[-4].dynstr); ! free(yyvsp[-2].dynstr); ! free(yyvsp[0].dynstr); ! ; ! break;} ! case 10: ! #line 96 "error_table.y" ! { yyval.dynstr = ds(yyvsp[0].dynstr); ! current_token = yyval.dynstr; ; ! break;} ! case 11: ! #line 101 "error_table.y" ! { yyval.dynstr = ds(yyvsp[0].dynstr); ! current_token = yyval.dynstr; ; ! break;} ! } ! /* the action file gets copied in in place of this dollarsign */ ! #line 487 "bison.simple" ! ! yyvsp -= yylen; ! yyssp -= yylen; ! #ifdef YYLSP_NEEDED ! yylsp -= yylen; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! short *ssp1 = yyss - 1; ! fprintf (stderr, "state stack now"); ! while (ssp1 != yyssp) ! fprintf (stderr, " %d", *++ssp1); ! fprintf (stderr, "\n"); ! } ! #endif ! ! *++yyvsp = yyval; ! ! #ifdef YYLSP_NEEDED ! yylsp++; ! if (yylen == 0) ! { ! yylsp->first_line = yylloc.first_line; ! yylsp->first_column = yylloc.first_column; ! yylsp->last_line = (yylsp-1)->last_line; ! yylsp->last_column = (yylsp-1)->last_column; ! yylsp->text = 0; ! } ! else ! { ! yylsp->last_line = (yylsp+yylen-1)->last_line; ! yylsp->last_column = (yylsp+yylen-1)->last_column; ! } ! #endif ! ! /* Now "shift" the result of the reduction. ! Determine what state that goes to, ! based on the state we popped back to ! and the rule number reduced by. */ ! ! yyn = yyr1[yyn]; ! ! yystate = yypgoto[yyn - YYNTBASE] + *yyssp; ! if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) ! yystate = yytable[yystate]; ! else ! yystate = yydefgoto[yyn - YYNTBASE]; ! ! goto yynewstate; ! ! yyerrlab: /* here on detecting error */ ! ! if (! yyerrstatus) ! /* If not already recovering from an error, report this error. */ ! { ! ++yynerrs; ! ! #ifdef YYERROR_VERBOSE ! yyn = yypact[yystate]; ! ! if (yyn > YYFLAG && yyn < YYLAST) ! { ! int size = 0; ! char *msg; ! int x, count; ! ! count = 0; ! /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ ! for (x = (yyn < 0 ? -yyn : 0); ! x < (sizeof(yytname) / sizeof(char *)); x++) ! if (yycheck[x + yyn] == x) ! size += strlen(yytname[x]) + 15, count++; ! msg = (char *) malloc(size + 15); ! if (msg != 0) ! { ! strcpy(msg, "parse error"); ! ! if (count < 5) ! { ! count = 0; ! for (x = (yyn < 0 ? -yyn : 0); ! x < (sizeof(yytname) / sizeof(char *)); x++) ! if (yycheck[x + yyn] == x) ! { ! strcat(msg, count == 0 ? ", expecting `" : " or `"); ! strcat(msg, yytname[x]); ! strcat(msg, "'"); ! count++; ! } ! } ! yyerror(msg); ! free(msg); ! } ! else ! yyerror ("parse error; also virtual memory exceeded"); ! } ! else ! #endif /* YYERROR_VERBOSE */ ! yyerror("parse error"); ! } ! ! goto yyerrlab1; ! yyerrlab1: /* here on error raised explicitly by an action */ ! ! if (yyerrstatus == 3) ! { ! /* if just tried and failed to reuse lookahead token after an error, discard it. */ ! ! /* return failure if at end of input */ ! if (yychar == YYEOF) ! YYABORT; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); ! #endif ! ! yychar = YYEMPTY; ! } ! ! /* Else will try to reuse lookahead token ! after shifting the error token. */ ! ! yyerrstatus = 3; /* Each real token shifted decrements this */ ! ! goto yyerrhandle; ! ! yyerrdefault: /* current state does not do anything special for the error token. */ ! ! #if 0 ! /* This is wrong; only states that explicitly want error tokens ! should shift them. */ ! yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ ! if (yyn) goto yydefault; ! #endif ! ! yyerrpop: /* pop the current state because it cannot handle the error token */ ! ! if (yyssp == yyss) YYABORT; ! yyvsp--; ! yystate = *--yyssp; ! #ifdef YYLSP_NEEDED ! yylsp--; ! #endif ! ! #if YYDEBUG != 0 ! if (yydebug) ! { ! short *ssp1 = yyss - 1; ! fprintf (stderr, "Error: state stack now"); ! while (ssp1 != yyssp) ! fprintf (stderr, " %d", *++ssp1); ! fprintf (stderr, "\n"); ! } ! #endif ! ! yyerrhandle: ! ! yyn = yypact[yystate]; ! if (yyn == YYFLAG) ! goto yyerrdefault; ! ! yyn += YYTERROR; ! if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) ! goto yyerrdefault; ! ! yyn = yytable[yyn]; ! if (yyn < 0) ! { ! if (yyn == YYFLAG) ! goto yyerrpop; ! yyn = -yyn; ! goto yyreduce; ! } ! else if (yyn == 0) ! goto yyerrpop; ! ! if (yyn == YYFINAL) ! YYACCEPT; ! ! #if YYDEBUG != 0 ! if (yydebug) ! fprintf(stderr, "Shifting error token, "); ! #endif ! ! *++yyvsp = yylval; ! #ifdef YYLSP_NEEDED ! *++yylsp = yylloc; ! #endif ! ! yystate = yyn; ! goto yynewstate; ! } ! #line 105 "error_table.y" ! ! /* ! * ! * Copyright 1986, 1987 by the MIT Student Information Processing Board ! * ! * For copyright info, see mit-sipb-cr.h. ! */ ! #ifndef AFS_NT40_ENV ! #include ! #endif ! #include ! #include ! #include ! #include ! #ifdef AFS_NT40_ENV ! #include ! #include ! #else ! #include ! #endif ! #include ! #include "error_table.h" ! #include "mit-sipb-cr.h" ! #include ! ! /* Copyright (C) 1998 Transarc Corporation. All rights reserved. ! * ! */ ! ! extern FILE *hfile, *cfile, *msfile; ! extern int use_msf; ! ! static afs_int32 gensym_n = 0; ! ! char *gensym(const char *x) ! { ! char *symbol; ! if (!gensym_n) { ! struct timeval tv; ! gettimeofday(&tv, (void *)0); ! gensym_n = (tv.tv_sec%10000)*100 + tv.tv_usec/10000; ! } ! symbol = (char *)malloc(32 * sizeof(char)); ! gensym_n++; ! sprintf(symbol, "et%ld", gensym_n); ! return(symbol); ! } ! ! char * ! ds(const char *string) ! { ! char *rv; ! rv = (char *)malloc(strlen(string)+1); ! strcpy(rv, string); ! return(rv); ! } ! ! char * ! quote(const char *string) ! { ! char *rv; ! rv = (char *)malloc(strlen(string)+3); ! strcpy(rv, "\""); ! strcat(rv, string); ! strcat(rv, "\""); ! return(rv); ! } ! ! afs_int32 table_number = 0; ! int current = 0; ! char **error_codes = (char **)NULL; ! ! void add_ec(const char *name, const char *description) ! { ! if (msfile) { ! if (current > 0) ! #ifndef sun ! fprintf(msfile, "%d\t%s\n", current, description); ! #else ! fprintf(msfile, "%d %s\n", current, description); ! #endif /* !sun */ ! } else { ! fprintf(cfile, "\t\"%s\",\n", description); ! } ! if (error_codes == (char **)NULL) { ! error_codes = (char **)malloc(sizeof(char *)); ! *error_codes = (char *)NULL; ! } ! error_codes = (char **)realloc((char *)error_codes, ! (current + 2)*sizeof(char *)); ! error_codes[current++] = ds(name); ! error_codes[current] = (char *)NULL; ! } ! ! void add_ec_val(const char *name, const char *val, const char *description) ! { ! const int ncurrent = atoi(val); ! if (ncurrent < current) { ! printf("Error code %s (%d) out of order", name, ! current); ! return; ! } ! ! while (ncurrent > current) { ! if (!msfile) ! fputs("\t(char *)NULL,\n", cfile); ! current++; ! } ! if (msfile) { ! if (current > 0) ! #ifndef sun ! fprintf(msfile, "%d\t%s\n", current, description); ! #else ! fprintf(msfile, "%d %s\n", current, description); ! #endif /* ! sun */ ! } else { ! fprintf(cfile, "\t\"%s\",\n", description); ! } ! if (error_codes == (char **)NULL) { ! error_codes = (char **)malloc(sizeof(char *)); ! *error_codes = (char *)NULL; ! } ! error_codes = (char **)realloc((char *)error_codes, ! (current + 2)*sizeof(char *)); ! error_codes[current++] = ds(name); ! error_codes[current] = (char *)NULL; ! } ! ! void put_ecs(void) ! { ! int i; ! for (i = 0; i < current; i++) { ! if (error_codes[i] != (char *)NULL) ! fprintf(hfile, "#define %-40s (%ldL)\n", ! error_codes[i], table_number + i); ! } ! } ! ! /* ! * char_to_num -- maps letters and numbers into a small numbering space ! * uppercase -> 1-26 ! * lowercase -> 27-52 ! * digits -> 53-62 ! * underscore-> 63 ! */ ! ! static const char char_set[] = ! "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"; ! ! int char_to_num(char c) ! { ! const char *where; ! int diff; ! ! where = strchr (char_set, c); ! if (where) { ! diff = where - char_set + 1; ! assert (diff < (1 << ERRCODE_RANGE)); ! return diff; ! } ! else if (isprint (c)) ! fprintf (stderr, ! "Illegal character `%c' in error table name\n", ! c); ! else ! fprintf (stderr, ! "Illegal character %03o in error table name\n", ! c); ! exit (1); ! } ! ! void set_table_num(char *string) ! { ! if (msfile) { ! set_table_1num(string); ! return; ! } ! if (strlen(string) > 4) { ! fprintf(stderr, "Table name %s too long, truncated ", ! string); ! string[4] = '\0'; ! fprintf(stderr, "to %s\n", string); ! } ! if (char_to_num (string[0]) > char_to_num ('z')) { ! fprintf (stderr, "%s%s%s%s", ! "First character of error table name must be ", ! "a letter; name ``", ! string, "'' rejected\n"); ! exit (1); ! } ! while (*string != '\0') { ! table_number = (table_number << BITS_PER_CHAR) ! + char_to_num(*string); ! string++; ! } ! table_number = table_number << ERRCODE_RANGE; ! } ! ! void set_table_fun(char *astring) ! { ! register char *tp; ! unsigned int tc; ! ! for(tp=astring; (tc = *tp) != 0; tp++) { ! if (!isdigit(tc)) { ! fprintf(stderr, "Table function '%s' must be a decimal integer.\n", ! astring); ! exit(1); ! } ! } ! if (msfile) ! table_number += (atoi(astring)) << 28; ! } ! ! /* for compatibility with old comerr's, we truncate package name to 4 ! * characters, but only store first 3 in the error code. Note that this ! * function, as a side effect, truncates the table name down to 4 chars. ! */ ! void set_table_1num(char *string) ! { ! afs_int32 temp; ! int ctr; ! ! if ((temp = strlen(string)) > 4) { ! fprintf(stderr, "Table name %s too long, truncated ", ! string); ! string[4] = '\0'; ! fprintf(stderr, "to %s\n", string); ! } ! if (temp == 4) { ! fprintf(stderr, "Table name %s too long, only 3 characters fit in error code.\n", ! string); ! } ! if (char_to_1num (string[0]) > char_to_1num ('z')) { ! fprintf (stderr, "%s%s%s%s", ! "First character of error table name must be ", ! "a letter; name ``", ! string, "'' rejected\n"); ! exit (1); ! } ! temp = 0; ! for(ctr=0; ctr < 3; ctr++) { /* copy at most 3 chars to integer */ ! if (*string == '\0') break; /* and watch for early end */ ! temp = (temp * 050) /* "radix fifty" is base 050 = 40 */ ! + char_to_1num(*string); ! string++; ! } ! table_number += temp << 12; ! } ! ! /* ! * char_to_num -- maps letters and numbers into very small space ! * 0-9 -> 0-9 ! * mixed case -> 10-35 ! * _ -> 36 ! * others are reserved ! */ ! ! static const char char_1set[] = ! "abcdefghijklmnopqrstuvwxyz_0123456789"; ! ! int char_to_1num(char c) ! { ! const char *where; ! int diff; ! ! if (isupper(c)) c = tolower(c); ! ! where = strchr (char_1set, c); ! if (where) { ! /* start at 1 so we can decode */ ! diff = where - char_1set; ! assert (diff < 050); /* it is radix 50, after all */ ! return diff; ! } ! else if (isprint (c)) ! fprintf (stderr, ! "Illegal character `%c' in error table name\n", ! c); ! else ! fprintf (stderr, ! "Illegal character %03o in error table name\n", ! c); ! exit (1); ! } ! ! #ifdef AFS_NT40_ENV ! #include "et_lex.lex_nt.c" ! #else ! #include "et_lex.lex.c" ! #endif Index: openafs/src/comerr/test/test.c diff -c openafs/src/comerr/test/test.c:1.3 openafs/src/comerr/test/test.c:1.3.4.1 *** openafs/src/comerr/test/test.c:1.3 Thu Jul 12 15:58:33 2001 --- openafs/src/comerr/test/test.c Wed Sep 19 18:40:31 2001 *************** *** 1,7 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/test/test.c,v 1.3 2001/07/12 19:58:33 shadow Exp $"); #include #include --- 1,7 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/comerr/test/test.c,v 1.3.4.1 2001/09/19 22:40:31 shadow Exp $"); #include #include *************** *** 27,44 **** printf("With 0: tgt-expired -> %s\n", error_message(KRB_MK_AP_TGTEXP)); ! initialize_krb_error_table(); ! initialize_krb_error_table(); printf("KRB error table initialized: base %d (%s), name %s\n", ! ERROR_TABLE_BASE_krb, error_message(ERROR_TABLE_BASE_krb), ! error_table_name(ERROR_TABLE_BASE_krb)); printf("With krb: tgt-expired -> %s\n", error_message(KRB_MK_AP_TGTEXP)); ! initialize_quux_error_table(); printf("QUUX error table initialized: base %d (%s), name %s\n", ! ERROR_TABLE_BASE_quux, error_message(ERROR_TABLE_BASE_quux), ! error_table_name(ERROR_TABLE_BASE_quux)); printf("Msg for TGT-expired is '%s'\n", error_message(KRB_MK_AP_TGTEXP)); --- 27,44 ---- printf("With 0: tgt-expired -> %s\n", error_message(KRB_MK_AP_TGTEXP)); ! initialize_KRB_error_table(); ! initialize_KRB_error_table(); printf("KRB error table initialized: base %d (%s), name %s\n", ! ERROR_TABLE_BASE_KRB, error_message(ERROR_TABLE_BASE_KRB), ! error_table_name(ERROR_TABLE_BASE_KRB)); printf("With krb: tgt-expired -> %s\n", error_message(KRB_MK_AP_TGTEXP)); ! initialize_QUUX_error_table(); printf("QUUX error table initialized: base %d (%s), name %s\n", ! ERROR_TABLE_BASE_QUUX, error_message(ERROR_TABLE_BASE_QUUX), ! error_table_name(ERROR_TABLE_BASE_QUUX)); printf("Msg for TGT-expired is '%s'\n", error_message(KRB_MK_AP_TGTEXP)); Index: openafs/src/comerr/test/test1.et diff -c openafs/src/comerr/test/test1.et:1.1 openafs/src/comerr/test/test1.et:1.1.12.1 *** openafs/src/comerr/test/test1.et:1.1 Fri Nov 3 21:25:23 2000 --- openafs/src/comerr/test/test1.et Wed Sep 19 18:40:31 2001 *************** *** 1,4 **** ! error_table krb error_code KRB_MK_AP_TKFIL, "Can't read ticket file" --- 1,4 ---- ! error_table KRB error_code KRB_MK_AP_TKFIL, "Can't read ticket file" Index: openafs/src/comerr/test/test2.et diff -c openafs/src/comerr/test/test2.et:1.1 openafs/src/comerr/test/test2.et:1.1.12.1 *** openafs/src/comerr/test/test2.et:1.1 Fri Nov 3 21:25:24 2000 --- openafs/src/comerr/test/test2.et Wed Sep 19 18:40:31 2001 *************** *** 1,4 **** ! error_table quux ec FOO_ERR, "foo" --- 1,4 ---- ! error_table QUUX ec FOO_ERR, "foo" Index: openafs/src/config/Makefile.i386_obsd29.in diff -c /dev/null openafs/src/config/Makefile.i386_obsd29.in:1.2.2.1 *** /dev/null Fri Sep 21 20:05:52 2001 --- openafs/src/config/Makefile.i386_obsd29.in Wed Sep 19 18:46:46 2001 *************** *** 0 **** --- 1,39 ---- + # Copyright 1998 Transarc Corporation + # + # AFS_OSTYPE used to indicate suffixes and os specific subdirectories. + AFS_OSTYPE = OBSD + + # + # compilation and link editor flags + DBG=-g + OPTMZ=-O2 + PAM_CFLAGS = -O2 -pipe -fpic + # Put -O2 here to _ensure_ all Makefiles pick it up. + XCFLAGS= -O2 + MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} + XLDFLAGS= + SHARE_LDFLAGS = -shared -Xlinker -x + SHLIB_SUFFIX=so + SHLIB_CFLAGS= -fpic + # + # libraries + MTLIBS=-pthread + TXLIBS= /usr/lib/libcurses.a + XLIBS=@LIB_AFSDB@ -lcompat + + # + # programs + AR=ar + AS=as + CP=cp + INSTALL=${TOP_SRCDIR}/pinstall/pinstall + LD=ld + MT_CC=cc + MV=mv + RANLIB=ranlib + RM=rm + # + # Other OS specific requirements + # + YACC =yacc + LEX =flex -l Index: openafs/src/config/Makefile.ppc_darwin_13.in diff -c openafs/src/config/Makefile.ppc_darwin_13.in:1.4 openafs/src/config/Makefile.ppc_darwin_13.in:1.4.2.1 *** openafs/src/config/Makefile.ppc_darwin_13.in:1.4 Fri Sep 7 19:34:53 2001 --- openafs/src/config/Makefile.ppc_darwin_13.in Thu Sep 20 16:12:33 2001 *************** *** 5,18 **** # # # compilation and link editor flags ! XCFLAGS=-traditional-cpp #MT_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV ${XCFLAGS} #MT_CC=cc KROOT= KINCLUDES=-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers #SHARE_LDFLAGS = ! LWP_OPTMZ=-g ! OPTMZ=-g DBG=-g REGEX_OBJ=regex.o --- 5,18 ---- # # # compilation and link editor flags ! XCFLAGS=-no-precomp #MT_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV ${XCFLAGS} #MT_CC=cc KROOT= KINCLUDES=-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers #SHARE_LDFLAGS = ! LWP_OPTMZ=-O2 ! OPTMZ=-O2 DBG=-g REGEX_OBJ=regex.o Index: openafs/src/config/Makefile.ppc_linux22.in diff -c openafs/src/config/Makefile.ppc_linux22.in:1.3 openafs/src/config/Makefile.ppc_linux22.in:1.3.2.1 *** openafs/src/config/Makefile.ppc_linux22.in:1.3 Tue Aug 28 19:12:54 2001 --- openafs/src/config/Makefile.ppc_linux22.in Wed Sep 19 18:29:18 2001 *************** *** 36,41 **** --- 36,42 ---- MV=mv RANLIB=ranlib RM=rm + INSTALL=${TOP_SRCDIR}/pinstall/pinstall # # Other OS specific requirements # Index: openafs/src/config/param.i386_obsd29.h diff -c /dev/null openafs/src/config/param.i386_obsd29.h:1.1.2.1 *** /dev/null Fri Sep 21 20:05:52 2001 --- openafs/src/config/param.i386_obsd29.h Wed Sep 19 18:59:39 2001 *************** *** 0 **** --- 1,115 ---- + /* + * Jim Rees, University of Michigan CITI + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + #ifndef IGNORE_STDS_H + #include + #include + #endif + + #define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ + #define AFS_X86_XBSD_ENV 1 + + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ + #define AFS_OBSD_ENV 1 + #define AFS_NONFSTRANS 1 + #define AFS_KERBEROS_ENV 1 + #define FTRUNC O_TRUNC + + #define IUPD 0x0010 + #define IACC 0x0020 + #define ICHG 0x0040 + #define IMOD 0x0080 + + #define IN_LOCK(ip) lockmgr(&ip->i_lock, LK_EXCLUSIVE, \ + (struct simplelock *)0, curproc) + #define IN_UNLOCK(ip) lockmgr(&ip->i_lock, LK_RELEASE, \ + (struct simplelock *)0, curproc) + + #define AFS_VM_RDWR_ENV 0 + #define AFS_VFS_ENV 1 + #define AFS_VFSINCL_ENV 1 + #define AFS_GREEDY43_ENV 1 + #define AFS_ENV 1 + + #define AFS_SYSCALL 210 + #define AFS_MOUNT_AFS "afs" + + #if 0 + #ifndef MOUNT_UFS + #define MOUNT_UFS "ufs" + #endif + + #ifndef MOUNT_AFS + #define MOUNT_AFS AFS_MOUNT_AFS + #endif + #endif /* 0 */ + #define SYS_NAME "i386_obsd29" + #define SYS_NAME_ID 2002 + + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't supports statvfs */ + + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + #define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ + + #define AFSLITTLE_ENDIAN 1 + + /* Extra kernel definitions (from kdefs file) */ + #ifdef _KERNEL + #define AFS_GLOBAL_SUNLOCK 1 + #define AFS_VFS34 1 /* What is VFS34??? */ + #define AFS_SHORTGID 0 /* are group id's short? */ + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_resid uio_resid + #define AFS_UIOSYS UIO_SYSSPACE + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MB_CLBYTES + #define osi_GetTime(x) microtime(x) + #define AFS_KALLOC(x) kalloc(x) + #define AFS_KFREE(x,y) kfree(x,y) + #define v_count v_usecount + #define v_vfsp v_mount + #define vfs_bsize mnt_stat.f_bsize + #define vfs_fsid mnt_stat.f_fsid + #define va_nodeid va_fileid + #define vfs_vnodecovered mnt_vnodecovered + #define direct dirent + #define vnode_t struct vnode + + #ifndef MUTEX_DEFAULT + #define MUTEX_DEFAULT 0 + #endif /* MUTEX_DEFAULT */ + + #ifndef SSYS + #define SSYS 0x00002 + #endif /* SSYS */ + + #define p_rcred p_ucred + + #define VN_RELE(vp) vrele(((struct vnode *)(vp))) + #define VN_HOLD(vp) VREF(((struct vnode *)(vp))) + + #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) + enum vcexcl {NONEXCL, EXCL}; + + #ifdef KERNEL + #ifndef MIN + #define MIN(A,B) ((A) < (B) ? (A) : (B)) + #endif + #ifndef MAX + #define MAX(A,B) ((A) > (B) ? (A) : (B)) + #endif + #endif /* KERNEL */ + + #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */ + #endif /* _KERNEL */ + + #endif /* AFS_PARAM_H */ Index: openafs/src/config/param.i386_obsd29_usr.h diff -c /dev/null openafs/src/config/param.i386_obsd29_usr.h:1.1.2.1 *** /dev/null Fri Sep 21 20:05:52 2001 --- openafs/src/config/param.i386_obsd29_usr.h Wed Sep 19 18:59:39 2001 *************** *** 0 **** --- 1,60 ---- + /* + * Jim Rees, University of Michigan CITI + */ + + #ifndef AFS_PARAM_H + #define AFS_PARAM_H + + + #define UKERNEL 1 /* user space kernel */ + #define AFS_ENV 1 + #define AFS_VFSINCL_ENV 1 + #define AFS_OBSD_ENV 1 + #define AFS_386i_ENV 1 /* 386 Architecture--for lwp stuff */ + #define AFS_NONFSTRANS 1 + #define AFS_KERBEROS_ENV + + #define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ + #define AFS_SYSCALL 210 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ + #include + + #define AFS_USERSPACE_IP_ADDR 1 + #define RXK_LISTENER_ENV 1 + #define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ + + /* Machine / Operating system information */ + #define SYS_NAME "i386_obsd29" + #define SYS_NAME_ID 2002 + #define AFSLITTLE_ENDIAN 1 + #define AFS_HAVE_FFS 1 /* Use system's ffs. */ + #define AFS_HAVE_STATVFS 0 /* System doesn't support statvfs */ + + #define afsio_iov uio_iov + #define afsio_iovcnt uio_iovcnt + #define afsio_offset uio_offset + #define afsio_seg uio_segflg + #define afsio_fmode uio_fmode + #define afsio_resid uio_resid + #define AFS_UIOSYS 1 + #define AFS_UIOUSER UIO_USERSPACE + #define AFS_CLBYTES MB_CLBYTES + #define AFS_MINCHANGE 2 + #define VATTR_NULL usr_vattr_null + + #define AFS_DIRENT + #ifndef CMSERVERPREF + #define CMSERVERPREF + #endif + + #include + #include + #include + #include + #include + #include + #include + #include + + #endif /* AFS_PARAM_H */ Index: openafs/src/dauth/dlog.c diff -c openafs/src/dauth/dlog.c:1.6 openafs/src/dauth/dlog.c:1.6.2.1 *** openafs/src/dauth/dlog.c:1.6 Tue Aug 7 20:03:41 2001 --- openafs/src/dauth/dlog.c Wed Sep 19 18:40:32 2001 *************** *** 71,77 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/dauth/dlog.c,v 1.6 2001/08/08 00:03:41 shadow Exp $"); #include #include --- 71,77 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/dauth/dlog.c,v 1.6.2.1 2001/09/19 22:40:32 shadow Exp $"); #include #include *************** *** 400,408 **** zero_argc = argc; zero_argv = argv; ! initialize_u_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "obtain Kerberos authentication"); --- 400,408 ---- zero_argc = argc; zero_argv = argv; ! initialize_U_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "obtain Kerberos authentication"); Index: openafs/src/des/NTMakefile diff -c openafs/src/des/NTMakefile:1.3 openafs/src/des/NTMakefile:1.3.2.1 *** openafs/src/des/NTMakefile:1.3 Thu Sep 6 23:38:19 2001 --- openafs/src/des/NTMakefile Wed Sep 19 18:32:51 2001 *************** *** 138,141 **** install9x: install clean:: ! $(DEL) $(LIBFILE) \ No newline at end of file --- 138,142 ---- install9x: install clean:: ! $(DEL) $(LIBFILE) $(GENERATED_FILES) ! Index: openafs/src/des/andrew-conf.h diff -c openafs/src/des/andrew-conf.h:1.10 openafs/src/des/andrew-conf.h:1.10.2.1 *** openafs/src/des/andrew-conf.h:1.10 Mon Aug 6 20:05:00 2001 --- openafs/src/des/andrew-conf.h Wed Sep 19 18:25:24 2001 *************** *** 39,44 **** --- 39,47 ---- #ifdef AFS_NT40_ENV #include "conf-winnt.h" #else + #ifdef AFS_XBSD_ENV + #include "conf-i386-obsd.h" + #else #if defined(AFS_LINUX20_ENV) || defined(AFS_DJGPP_ENV) #ifdef AFS_PPC_LINUX20_ENV #include "conf-ppc-linux.h" *************** *** 74,79 **** --- 77,83 ---- #endif #endif /* AFS_LINUX20_ENV */ #endif /* AFS_NT40_ENV */ + #endif /* AFS_XBSD_ENV */ #endif /* NCR || X86 */ #endif /* __alpha */ #endif /* SGI */ Index: openafs/src/des/conf-i386-obsd.h diff -c /dev/null openafs/src/des/conf-i386-obsd.h:1.1.2.1 *** /dev/null Fri Sep 21 20:05:52 2001 --- openafs/src/des/conf-i386-obsd.h Wed Sep 19 18:59:43 2001 *************** *** 0 **** --- 1,5 ---- + #define NOASM + #define BITS32 + #define BIG + #define BSDUNIX + #define LSBFIRST Index: openafs/src/des/read_pssword.c diff -c openafs/src/des/read_pssword.c:1.12 openafs/src/des/read_pssword.c:1.12.2.1 *** openafs/src/des/read_pssword.c:1.12 Tue Aug 7 20:03:41 2001 --- openafs/src/des/read_pssword.c Wed Sep 19 18:25:24 2001 *************** *** 14,20 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/des/read_pssword.c,v 1.12 2001/08/08 00:03:41 shadow Exp $"); #include #include --- 14,20 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/des/read_pssword.c,v 1.12.2.1 2001/09/19 22:25:24 shadow Exp $"); #include #include *************** *** 62,68 **** #endif static int intrupt; ! #if defined(AFS_SGI_ENV) || defined (AFS_AIX_ENV) || defined(AFS_FBSD_ENV) /*|| defined (AFS_HPUX_ENV) || defined(AFS_SUN5_ENV)*/ #undef BSDUNIX #endif --- 62,68 ---- #endif static int intrupt; ! #if defined(AFS_SGI_ENV) || defined (AFS_AIX_ENV) || defined(AFS_XBSD_ENV) /*|| defined (AFS_HPUX_ENV) || defined(AFS_SUN5_ENV)*/ #undef BSDUNIX #endif *************** *** 112,118 **** return ok; } ! #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) static void catch(int); #endif --- 112,118 ---- return ok; } ! #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) static void catch(int); #endif *************** *** 134,145 **** { int ok = 0, cnt1=0; char *ptr; ! #if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) register int fno; struct sigaction newsig, oldsig; struct termios save_ttyb, ttyb; #endif ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) FILE *fi; #endif #if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV) --- 134,145 ---- { int ok = 0, cnt1=0; char *ptr; ! #if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) register int fno; struct sigaction newsig, oldsig; struct termios save_ttyb, ttyb; #endif ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) FILE *fi; #endif #if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV) *************** *** 172,178 **** return -1; } ! #if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) if ((fi = fopen("/dev/tty", "r")) == NULL) return -1; setbuf(fi, (char *)NULL); /* We don't want any buffering for our i/o. */ --- 172,178 ---- return -1; } ! #if defined(AFS_HPUX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if ((fi = fopen("/dev/tty", "r")) == NULL) return -1; setbuf(fi, (char *)NULL); /* We don't want any buffering for our i/o. */ *************** *** 310,316 **** if (!ok) memset(s, 0, maxa); printf("\n"); ! #if defined(AFS_HPUX_ENV) || defined(AFS_FBSD_ENV) /* * Restore the terminal to its previous characteristics. * Restore the old signal handler for SIGINT. --- 310,316 ---- if (!ok) memset(s, 0, maxa); printf("\n"); ! #if defined(AFS_HPUX_ENV) || defined(AFS_XBSD_ENV) /* * Restore the terminal to its previous characteristics. * Restore the old signal handler for SIGINT. *************** *** 400,406 **** #endif ! #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) static void catch(int junk) { --- 400,406 ---- #endif ! #if defined (AFS_AIX_ENV) || defined (AFS_HPUX_ENV) || defined(AFS_SGI_ENV) || defined(AFS_SUN_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) static void catch(int junk) { Index: openafs/src/dir/buffer.c diff -c openafs/src/dir/buffer.c:1.5 openafs/src/dir/buffer.c:1.5.2.1 *** openafs/src/dir/buffer.c:1.5 Mon Aug 6 20:05:01 2001 --- openafs/src/dir/buffer.c Wed Sep 19 18:36:21 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/buffer.c,v 1.5 2001/08/07 00:05:01 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/buffer.c,v 1.5.2.1 2001/09/19 22:36:21 shadow Exp $"); #include #include *************** *** 75,80 **** --- 75,81 ---- {*abuffers = nbuffers; *acalls = calls; *aios = ios; + return 0; } int DInit (abuffers) *************** *** 215,221 **** register struct buffer *lp; /* pointer to a fairly-old buffer */ {/* Find a usable buffer slot */ register afs_int32 i; ! afs_int32 lt,pt; register struct buffer **tbp; if (lp && (lp->lockers == 0)) { --- 216,222 ---- register struct buffer *lp; /* pointer to a fairly-old buffer */ {/* Find a usable buffer slot */ register afs_int32 i; ! afs_int32 lt; register struct buffer **tbp; if (lp && (lp->lockers == 0)) { *************** *** 263,268 **** --- 264,270 ---- return lp; } + void DRelease (bp,flag) register struct buffer *bp; int flag; Index: openafs/src/dir/salvage.c diff -c openafs/src/dir/salvage.c:1.5 openafs/src/dir/salvage.c:1.5.2.1 *** openafs/src/dir/salvage.c:1.5 Tue Aug 7 20:03:42 2001 --- openafs/src/dir/salvage.c Wed Sep 19 18:36:21 2001 *************** *** 12,18 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/salvage.c,v 1.5 2001/08/08 00:03:42 shadow Exp $"); #include #include --- 12,18 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/dir/salvage.c,v 1.5.2.1 2001/09/19 22:36:21 shadow Exp $"); #include #include *************** *** 393,399 **** afs_int32 dot[3], dotdot[3], lfid[3], code, usedPages; char tname[256]; register int i; ! register char *tp, tc; struct DirHeader *dhp; struct DirEntry *ep; int entry; --- 393,399 ---- afs_int32 dot[3], dotdot[3], lfid[3], code, usedPages; char tname[256]; register int i; ! register char *tp; struct DirHeader *dhp; struct DirEntry *ep; int entry; Index: openafs/src/finale/translate_et.c diff -c openafs/src/finale/translate_et.c:1.5 openafs/src/finale/translate_et.c:1.5.4.1 *** openafs/src/finale/translate_et.c:1.5 Thu Jul 12 15:58:36 2001 --- openafs/src/finale/translate_et.c Wed Sep 19 18:40:33 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/finale/translate_et.c,v 1.5 2001/07/12 19:58:36 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/finale/translate_et.c,v 1.5.4.1 2001/09/19 22:40:33 shadow Exp $"); #include #include *************** *** 55,70 **** nsa.sa_flags = SA_FULLDUMP; sigaction(SIGSEGV, &nsa, NULL); #endif ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); ! initialize_pt_error_table(); ! initialize_bz_error_table(); ! initialize_u_error_table(); ! initialize_vols_error_table(); if (argc < 2) { fprintf (stderr, "Usage is: %s []+\n", argv[0]); --- 55,70 ---- nsa.sa_flags = SA_FULLDUMP; sigaction(SIGSEGV, &nsa, NULL); #endif ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_CMD_error_table(); ! initialize_VL_error_table(); ! initialize_PT_error_table(); ! initialize_BZ_error_table(); ! initialize_U_error_table(); ! initialize_VOLS_error_table(); if (argc < 2) { fprintf (stderr, "Usage is: %s []+\n", argv[0]); Index: openafs/src/kauth/NTMakefile diff -c openafs/src/kauth/NTMakefile:1.3 openafs/src/kauth/NTMakefile:1.3.4.1 *** openafs/src/kauth/NTMakefile:1.3 Mon Apr 30 02:55:16 2001 --- openafs/src/kauth/NTMakefile Wed Sep 19 18:32:52 2001 *************** *** 219,224 **** clean:: $(DEL) $(KPASSWD_EXEFILE) ! ! --- 219,224 ---- clean:: $(DEL) $(KPASSWD_EXEFILE) ! $(DEL) kauth.cs.c kauth.h kauth.ss.c kauth.xdr.c kautils.h ! $(DEL) kaerrors.c Index: openafs/src/kauth/admin_tools.c diff -c openafs/src/kauth/admin_tools.c:1.8 openafs/src/kauth/admin_tools.c:1.8.2.1 *** openafs/src/kauth/admin_tools.c:1.8 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/admin_tools.c Wed Sep 19 18:36:23 2001 *************** *** 15,21 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/admin_tools.c,v 1.8 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 15,21 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/admin_tools.c,v 1.8.2.1 2001/09/19 22:36:23 shadow Exp $"); #include #include *************** *** 1449,1457 **** char *arock) { afs_int32 code; - struct ktc_principal server; #ifdef notdef if (as->parms[0].items) { char *name = as->parms[0].items->data; code = ka_ParseLoginName --- 1449,1458 ---- char *arock) { afs_int32 code; #ifdef notdef + struct ktc_principal server; + if (as->parms[0].items) { char *name = as->parms[0].items->data; code = ka_ParseLoginName Index: openafs/src/kauth/authclient.c diff -c openafs/src/kauth/authclient.c:1.7 openafs/src/kauth/authclient.c:1.7.2.1 *** openafs/src/kauth/authclient.c:1.7 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/authclient.c Wed Sep 19 18:36:23 2001 *************** *** 16,22 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/authclient.c,v 1.7 2001/08/08 00:03:46 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 16,22 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/authclient.c,v 1.7.2.1 2001/09/19 22:36:23 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 637,643 **** des_key_schedule schedule; int version; afs_int32 pwexpires; - char bob[KA_TIMESTR_LEN]; LOCK_GLOBAL_MUTEX aticket.SeqLen = auth_token->ticketLen; --- 637,642 ---- Index: openafs/src/kauth/client.c diff -c openafs/src/kauth/client.c:1.7 openafs/src/kauth/client.c:1.7.2.1 *** openafs/src/kauth/client.c:1.7 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/client.c Wed Sep 19 18:40:34 2001 *************** *** 14,20 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/client.c,v 1.7 2001/08/08 00:03:46 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 14,20 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/client.c,v 1.7.2.1 2001/09/19 22:40:34 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 294,304 **** return 0; } inited++; ! initialize_u_error_table(); ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); code = ka_CellConfig (AFSDIR_CLIENT_ETC_DIRPATH); UNLOCK_GLOBAL_MUTEX --- 294,304 ---- return 0; } inited++; ! initialize_U_error_table(); ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); code = ka_CellConfig (AFSDIR_CLIENT_ETC_DIRPATH); UNLOCK_GLOBAL_MUTEX Index: openafs/src/kauth/decode_ticket.c diff -c openafs/src/kauth/decode_ticket.c:1.4 openafs/src/kauth/decode_ticket.c:1.4.4.1 *** openafs/src/kauth/decode_ticket.c:1.4 Thu Jul 12 15:58:40 2001 --- openafs/src/kauth/decode_ticket.c Wed Sep 19 18:40:34 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/decode_ticket.c,v 1.4 2001/07/12 19:58:40 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/decode_ticket.c,v 1.4.4.1 2001/09/19 22:40:34 shadow Exp $"); #include #include *************** *** 35,42 **** char bob[KA_TIMESTR_LEN]; whoami = argv[0]; ! initialize_rxk_error_table(); ! initialize_ka_error_table(); if (argc != 3) { printf ("Usage is %s key ticket\n", whoami); --- 35,42 ---- char bob[KA_TIMESTR_LEN]; whoami = argv[0]; ! initialize_RXK_error_table(); ! initialize_KA_error_table(); if (argc != 3) { printf ("Usage is %s key ticket\n", whoami); Index: openafs/src/kauth/kaauxdb.c diff -c openafs/src/kauth/kaauxdb.c:1.5 openafs/src/kauth/kaauxdb.c:1.5.4.1 *** openafs/src/kauth/kaauxdb.c:1.5 Thu Jul 12 15:58:40 2001 --- openafs/src/kauth/kaauxdb.c Wed Sep 19 18:36:23 2001 *************** *** 14,20 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaauxdb.c,v 1.5 2001/07/12 19:58:40 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 14,20 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaauxdb.c,v 1.5.4.1 2001/09/19 22:36:23 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 165,171 **** unsigned int nfailures, myshare; afs_uint32 lasttime; struct ubik_debug beaconinfo; - afs_uint32 now; /* if attempts is 0, that means there's no limit, so the id * can't ever be locked... --- 165,170 ---- Index: openafs/src/kauth/kaerrors.et diff -c openafs/src/kauth/kaerrors.et:1.2 openafs/src/kauth/kaerrors.et:1.2.8.1 *** openafs/src/kauth/kaerrors.et:1.2 Sat Nov 4 05:04:37 2000 --- openafs/src/kauth/kaerrors.et Wed Sep 19 18:40:34 2001 *************** *** 12,18 **** # NOTE: KANOAUTH value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table ka ec KADATABASEINCONSISTENT, "AuthServer database is inconsistent" ec KAEXIST, "user already exists" ec KAIO, "Ubik I/O error" --- 12,18 ---- # NOTE: KANOAUTH value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table KA ec KADATABASEINCONSISTENT, "AuthServer database is inconsistent" ec KAEXIST, "user already exists" ec KAIO, "Ubik I/O error" Index: openafs/src/kauth/kaprocs.c diff -c openafs/src/kauth/kaprocs.c:1.8 openafs/src/kauth/kaprocs.c:1.8.2.1 *** openafs/src/kauth/kaprocs.c:1.8 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/kaprocs.c Wed Sep 19 18:36:23 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaprocs.c,v 1.8 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaprocs.c,v 1.8.2.1 2001/09/19 22:36:23 shadow Exp $"); #include #include *************** *** 707,713 **** int code; Date now; int i; - int reuse_p; extern int MinHours; afs_uint32 newsum; --- 707,712 ---- *************** *** 1277,1284 **** afs_int32 caller; afs_int32 tentry_offset; /* offset of entry */ struct kaentry tentry; ! unsigned char newvals[4], oldvals[4]; ! int i; COUNT_REQ (SetFields); --- 1276,1282 ---- afs_int32 caller; afs_int32 tentry_offset; /* offset of entry */ struct kaentry tentry; ! unsigned char newvals[4]; COUNT_REQ (SetFields); *************** *** 1953,1965 **** struct rx_call *call; char *name; EncryptionKey *password; ! { int code = KANOAUTH; afs_int32 to; struct ubik_trans *tt; struct kaentry tentry; - COUNT_REQ (GetPassword); - #ifdef GETPASSWORD if (!name_instance_legal (name, "")) return KABADNAME; /* only requests from this host work */ if (rx_HostOf(rx_PeerOf(rx_ConnectionOf(call))) != htonl(INADDR_LOOPBACK)) --- 1951,1966 ---- struct rx_call *call; char *name; EncryptionKey *password; ! { ! int code = KANOAUTH; ! COUNT_REQ (GetPassword); ! ! #ifdef GETPASSWORD ! { afs_int32 to; struct ubik_trans *tt; struct kaentry tentry; if (!name_instance_legal (name, "")) return KABADNAME; /* only requests from this host work */ if (rx_HostOf(rx_PeerOf(rx_ConnectionOf(call))) != htonl(INADDR_LOOPBACK)) *************** *** 1968,1976 **** /* this isn't likely to be used because of string to key problems, so since this is a temporary thing anyway, we'll use it here. */ ! { extern char udpAuthPrincipal[256]; save_principal (udpAuthPrincipal, name, 0, 0); } get_time (0,0,0); /* update random value */ code = FindBlock(tt, name, "", &to, &tentry); if (code) goto abort; --- 1969,1980 ---- /* this isn't likely to be used because of string to key problems, so since this is a temporary thing anyway, we'll use it here. */ ! { ! extern char udpAuthPrincipal[256]; ! save_principal (udpAuthPrincipal, name, 0, 0); } + get_time (0,0,0); /* update random value */ code = FindBlock(tt, name, "", &to, &tentry); if (code) goto abort; *************** *** 1984,1989 **** --- 1988,1994 ---- memcpy(password, &tentry.key, sizeof (*password)); code = ubik_EndTrans (tt); + } #endif return code; } Index: openafs/src/kauth/kas.c diff -c openafs/src/kauth/kas.c:1.4 openafs/src/kauth/kas.c:1.4.4.1 *** openafs/src/kauth/kas.c:1.4 Thu Jul 12 15:58:40 2001 --- openafs/src/kauth/kas.c Wed Sep 19 18:40:34 2001 *************** *** 11,17 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kas.c,v 1.4 2001/07/12 19:58:40 shadow Exp $"); #include #ifdef AFS_AIX32_ENV --- 11,17 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kas.c,v 1.4.4.1 2001/09/19 22:40:34 shadow Exp $"); #include #ifdef AFS_AIX32_ENV *************** *** 59,69 **** sigaction(SIGABRT, &nsa, NULL); sigaction(SIGSEGV, &nsa, NULL); #endif ! initialize_cmd_error_table(); ! initialize_ktc_error_table(); ! initialize_ka_error_table(); ! initialize_acfg_error_table(); ! initialize_u_error_table(); #ifdef AFS_NT40_ENV /* initialize winsock */ --- 59,69 ---- sigaction(SIGABRT, &nsa, NULL); sigaction(SIGSEGV, &nsa, NULL); #endif ! initialize_CMD_error_table(); ! initialize_KTC_error_table(); ! initialize_KA_error_table(); ! initialize_ACFG_error_table(); ! initialize_U_error_table(); #ifdef AFS_NT40_ENV /* initialize winsock */ Index: openafs/src/kauth/kaserver.c diff -c openafs/src/kauth/kaserver.c:1.9 openafs/src/kauth/kaserver.c:1.9.2.1 *** openafs/src/kauth/kaserver.c:1.9 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/kaserver.c Wed Sep 19 18:25:24 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaserver.c,v 1.9 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/kaserver.c,v 1.9.2.1 2001/09/19 22:25:24 shadow Exp $"); #include #include *************** *** 55,61 **** int npwSums = KA_NPWSUMS; /* needs to be variable sometime */ #include ! #if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #undef vfprintf #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream) #endif --- 55,61 ---- int npwSums = KA_NPWSUMS; /* needs to be variable sometime */ #include ! #if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #undef vfprintf #define vfprintf(stream,fmt,args) _doprnt(fmt,args,stream) #endif Index: openafs/src/kauth/kautils.p.h diff -c openafs/src/kauth/kautils.p.h:1.4 openafs/src/kauth/kautils.p.h:1.4.4.1 *** openafs/src/kauth/kautils.p.h:1.4 Sun Jun 3 12:27:03 2001 --- openafs/src/kauth/kautils.p.h Wed Sep 19 18:40:34 2001 *************** *** 428,437 **** char ticket[MAXKTCTICKETLEN]; }; ! #ifndef ERROR_TABLE_BASE_ka #define ka_ErrorString error_message #undef KAMINERROR ! #define KAMINERROR ERROR_TABLE_BASE_ka #define KAMAXERROR (KAMINERROR+255) #endif --- 428,437 ---- char ticket[MAXKTCTICKETLEN]; }; ! #ifndef ERROR_TABLE_BASE_KA #define ka_ErrorString error_message #undef KAMINERROR ! #define KAMINERROR ERROR_TABLE_BASE_KA #define KAMAXERROR (KAMINERROR+255) #endif Index: openafs/src/kauth/klogin.c diff -c openafs/src/kauth/klogin.c:1.7 openafs/src/kauth/klogin.c:1.7.2.1 *** openafs/src/kauth/klogin.c:1.7 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/klogin.c Wed Sep 19 18:25:24 2001 *************** *** 21,29 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/klogin.c,v 1.7 2001/08/08 00:03:46 shadow Exp $"); ! #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) &&!defined(AFS_FBSD_ENV) #include #define quota(a,b,c,d) 0 --- 21,29 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/klogin.c,v 1.7.2.1 2001/09/19 22:25:24 shadow Exp $"); ! #if !defined(AFS_SUN_ENV) && !defined(AFS_AIX_ENV) && !defined(AFS_HPUX_ENV) && !defined(AFS_SGI_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #define quota(a,b,c,d) 0 Index: openafs/src/kauth/krb_udp.c diff -c openafs/src/kauth/krb_udp.c:1.14 openafs/src/kauth/krb_udp.c:1.14.2.1 *** openafs/src/kauth/krb_udp.c:1.14 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/krb_udp.c Wed Sep 19 18:36:23 2001 *************** *** 15,21 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/krb_udp.c,v 1.14 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 15,21 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/krb_udp.c,v 1.14.2.1 2001/09/19 22:36:23 shadow Exp $"); #include #include *************** *** 100,106 **** static FiveMinuteCheckLWP() { - struct timeval time; printf("start 5 min check lwp\n"); --- 100,105 ---- *************** *** 554,560 **** return code; } ! static err_packet (ksoc, pkt, code, reason) int ksoc; struct packet *pkt; afs_int32 code; --- 553,559 ---- return code; } ! static int err_packet (ksoc, pkt, code, reason) int ksoc; struct packet *pkt; afs_int32 code; *************** *** 576,582 **** 3/* nulls */ + (2 * sizeof(afs_int32)) + strlen (buf) + 1; if (ans.len > sizeof(ans.data)) { printf ("Answer packet too long\n"); ! return; } *answer++ = (unsigned char) KRB_PROT_VERSION; --- 575,581 ---- 3/* nulls */ + (2 * sizeof(afs_int32)) + strlen (buf) + 1; if (ans.len > sizeof(ans.data)) { printf ("Answer packet too long\n"); ! return -1; } *answer++ = (unsigned char) KRB_PROT_VERSION; *************** *** 601,608 **** --- 600,609 ---- code, ans.len); else perror ("err_packet: sendto"); } + return 0; } + int process_udp_auth (ksoc, pkt) int ksoc; struct packet *pkt; *************** *** 632,638 **** if ((strlen(realm) > 0) && (strcmp (realm, lrealm) != 0)) { err_packet (ksoc, pkt, KERB_ERR_NONNULL_REALM, "null realm name not allowed"); ! return; } memcpy(&startTime, packet, sizeof(startTime)); packet += sizeof(startTime); --- 633,639 ---- if ((strlen(realm) > 0) && (strcmp (realm, lrealm) != 0)) { err_packet (ksoc, pkt, KERB_ERR_NONNULL_REALM, "null realm name not allowed"); ! return -1; } memcpy(&startTime, packet, sizeof(startTime)); packet += sizeof(startTime); *************** *** 644,656 **** if (code < 0) { err_packet (ksoc, pkt, KERB_ERR_BAD_LIFETIME, "requested ticket lifetime invalid"); ! return; } getstr (sname); getstr (sinst); if ((packet - pkt->data) != pkt->len) { err_packet (ksoc, pkt, KERB_ERR_PKT_LENGTH, "packet length inconsistent"); ! return; } pkt->rest = packet; code = UDP_Authenticate (ksoc, &pkt->from, name, inst, --- 645,657 ---- if (code < 0) { err_packet (ksoc, pkt, KERB_ERR_BAD_LIFETIME, "requested ticket lifetime invalid"); ! return -1; } getstr (sname); getstr (sinst); if ((packet - pkt->data) != pkt->len) { err_packet (ksoc, pkt, KERB_ERR_PKT_LENGTH, "packet length inconsistent"); ! return -1; } pkt->rest = packet; code = UDP_Authenticate (ksoc, &pkt->from, name, inst, *************** *** 665,673 **** } else err_packet (ksoc, pkt, code, (char *)error_message (code)); } ! return; } process_udp_appl (ksoc, pkt) int ksoc; struct packet *pkt; --- 666,675 ---- } else err_packet (ksoc, pkt, code, (char *)error_message (code)); } ! return 0; } + int process_udp_appl (ksoc, pkt) int ksoc; struct packet *pkt; *************** *** 689,701 **** authLen = *(unsigned char *)packet++; if (ticketLen > sizeof(ticket)) { err_packet (ksoc, pkt, KERB_ERR_TEXT_LENGTH, "ticket too long"); ! return; } memcpy(ticket, packet, ticketLen); packet += ticketLen; if (authLen > sizeof(auth)) { err_packet (ksoc, pkt, KERB_ERR_TEXT_LENGTH, "authenticator too long"); ! return; } memcpy(auth, packet, authLen); pkt->rest = packet + authLen; --- 691,703 ---- authLen = *(unsigned char *)packet++; if (ticketLen > sizeof(ticket)) { err_packet (ksoc, pkt, KERB_ERR_TEXT_LENGTH, "ticket too long"); ! return -1; } memcpy(ticket, packet, ticketLen); packet += ticketLen; if (authLen > sizeof(auth)) { err_packet (ksoc, pkt, KERB_ERR_TEXT_LENGTH, "authenticator too long"); ! return -1; } memcpy(auth, packet, authLen); pkt->rest = packet + authLen; *************** *** 703,712 **** if (code) { if (code == KANOENT) code = KERB_ERR_PRINCIPAL_UNKNOWN; err_packet (ksoc, pkt, code, (char*)error_message (code)); ! return; } } process_udp_request (ksoc, pkt) int ksoc; struct packet *pkt; --- 705,716 ---- if (code) { if (code == KANOENT) code = KERB_ERR_PRINCIPAL_UNKNOWN; err_packet (ksoc, pkt, code, (char*)error_message (code)); ! return -1; } + return 0; } + void process_udp_request (ksoc, pkt) int ksoc; struct packet *pkt; Index: openafs/src/kauth/rebuild.c diff -c openafs/src/kauth/rebuild.c:1.7 openafs/src/kauth/rebuild.c:1.7.2.1 *** openafs/src/kauth/rebuild.c:1.7 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/rebuild.c Wed Sep 19 18:36:23 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/rebuild.c,v 1.7 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/rebuild.c,v 1.7.2.1 2001/09/19 22:36:23 shadow Exp $"); #include #include *************** *** 41,46 **** --- 41,48 ---- int fd; FILE *out; + void badEntry(); + int listuheader, listkheader, listentries, verbose; int readUbikHeader() *************** *** 82,87 **** --- 84,90 ---- return(0); } + void PrintHeader(header) struct kaheader *header; { *************** *** 100,105 **** --- 103,109 ---- printf("stats.cpw commands = %d\n", header->stats.cpws); } + void PrintEntry(index, entry) afs_int32 index; struct kaentry *entry; *************** *** 221,226 **** --- 225,231 ---- return(principal); } + void RebuildEntry(entryp) struct kaentry *entryp; { *************** *** 365,371 **** char *arock; { afs_int32 code; - int a; char *dbFile; char *outFile; afs_int32 index; --- 370,375 ---- *************** *** 556,561 **** --- 560,566 ---- exit (code != 0); } + void badEntry(e, i) afs_int32 e, i; { *************** *** 585,591 **** char *argv[]; { struct cmd_syndesc *ts; - struct cmd_item *ti; setlinebuf(stdout); --- 590,595 ---- Index: openafs/src/kauth/token.c diff -c openafs/src/kauth/token.c:1.4 openafs/src/kauth/token.c:1.4.4.1 *** openafs/src/kauth/token.c:1.4 Thu Jul 12 15:58:40 2001 --- openafs/src/kauth/token.c Wed Sep 19 18:36:23 2001 *************** *** 18,24 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/token.c,v 1.4 2001/07/12 19:58:40 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 18,24 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/token.c,v 1.4.4.1 2001/09/19 22:36:23 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 320,327 **** afs_int32 now = time(0); struct ktc_token token; char cellname[MAXKTCREALMLEN]; - char realm[MAXKTCREALMLEN]; - struct ktc_principal client, server; afs_int32 pwexpires; LOCK_GLOBAL_MUTEX --- 320,325 ---- Index: openafs/src/kauth/user.c diff -c openafs/src/kauth/user.c:1.7 openafs/src/kauth/user.c:1.7.2.1 *** openafs/src/kauth/user.c:1.7 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/user.c Wed Sep 19 18:25:24 2001 *************** *** 17,23 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/user.c,v 1.7 2001/08/08 00:03:46 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 17,23 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/kauth/user.c,v 1.7.2.1 2001/09/19 22:25:24 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 186,192 **** } #endif ! #if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_FBSD_ENV) /* handle smoothly the case where no AFS system calls exists (yet) */ old = (int (*)())signal(SIGSYS, SIG_IGN); #endif --- 186,192 ---- } #endif ! #if !defined(AFS_NT40_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_USR_LINUX20_ENV) && !defined(AFS_XBSD_ENV) /* handle smoothly the case where no AFS system calls exists (yet) */ old = (int (*)())signal(SIGSYS, SIG_IGN); #endif Index: openafs/src/kauth/test/test_getticket.c diff -c openafs/src/kauth/test/test_getticket.c:1.5 openafs/src/kauth/test/test_getticket.c:1.5.2.1 *** openafs/src/kauth/test/test_getticket.c:1.5 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/test/test_getticket.c Wed Sep 19 18:40:34 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_getticket.c,v 1.5 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_getticket.c,v 1.5.2.1 2001/09/19 22:40:34 shadow Exp $"); #include #include *************** *** 472,483 **** register struct cmd_syndesc *ts; long code; ! initialize_u_error_table(); ! initialize_cmd_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_ka_error_table(); ts = cmd_CreateSyntax (0, Main, 0, "Main program"); /* 0 */ cmd_AddParm (ts, "-patient", CMD_FLAG, CMD_OPTIONAL, --- 472,483 ---- register struct cmd_syndesc *ts; long code; ! initialize_U_error_table(); ! initialize_CMD_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_KA_error_table(); ts = cmd_CreateSyntax (0, Main, 0, "Main program"); /* 0 */ cmd_AddParm (ts, "-patient", CMD_FLAG, CMD_OPTIONAL, Index: openafs/src/kauth/test/test_interim_ktc.c diff -c openafs/src/kauth/test/test_interim_ktc.c:1.5 openafs/src/kauth/test/test_interim_ktc.c:1.5.2.1 *** openafs/src/kauth/test/test_interim_ktc.c:1.5 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/test/test_interim_ktc.c Wed Sep 19 18:40:34 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_interim_ktc.c,v 1.5 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_interim_ktc.c,v 1.5.2.1 2001/09/19 22:40:34 shadow Exp $"); #include #include *************** *** 733,743 **** srandom (1); /* Initialize com_err error code hacking */ ! initialize_u_error_table(); ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); /* set defaults */ strcpy (cell, ""); --- 733,743 ---- srandom (1); /* Initialize com_err error code hacking */ ! initialize_U_error_table(); ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); /* set defaults */ strcpy (cell, ""); Index: openafs/src/kauth/test/test_rxkad_free.c diff -c openafs/src/kauth/test/test_rxkad_free.c:1.5 openafs/src/kauth/test/test_rxkad_free.c:1.5.2.1 *** openafs/src/kauth/test/test_rxkad_free.c:1.5 Tue Aug 7 20:03:46 2001 --- openafs/src/kauth/test/test_rxkad_free.c Wed Sep 19 18:40:34 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_rxkad_free.c,v 1.5 2001/08/08 00:03:46 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/kauth/test/test_rxkad_free.c,v 1.5.2.1 2001/09/19 22:40:34 shadow Exp $"); #include #include *************** *** 340,351 **** register struct cmd_syndesc *ts; long code; ! initialize_u_error_table(); ! initialize_cmd_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_ka_error_table(); ts = cmd_CreateSyntax (0, Main, 0, "Main program"); /* 0 */ cmd_AddParm (ts, "-number", CMD_SINGLE, CMD_OPTIONAL, --- 340,351 ---- register struct cmd_syndesc *ts; long code; ! initialize_U_error_table(); ! initialize_CMD_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_KA_error_table(); ts = cmd_CreateSyntax (0, Main, 0, "Main program"); /* 0 */ cmd_AddParm (ts, "-number", CMD_SINGLE, CMD_OPTIONAL, Index: openafs/src/libacl/aclprocs.c diff -c openafs/src/libacl/aclprocs.c:1.9 openafs/src/libacl/aclprocs.c:1.9.2.1 *** openafs/src/libacl/aclprocs.c:1.9 Tue Aug 7 22:38:45 2001 --- openafs/src/libacl/aclprocs.c Wed Sep 19 18:36:24 2001 *************** *** 16,22 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/libacl/aclprocs.c,v 1.9 2001/08/08 02:38:45 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 16,22 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/libacl/aclprocs.c,v 1.9.2.1 2001/09/19 22:36:24 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 222,228 **** register char *nextc; register afs_int32 code; int p,n; - char tbuf[PR_MAXNAMELEN+1]; namelist lnames; idlist lids; --- 222,227 ---- *************** *** 377,382 **** --- 376,382 ---- #ifdef AFS_PTHREAD_ENV assert(pthread_mutex_init(&acl_list_mutex, NULL) == 0); #endif /* AFS_PTHREAD_ENV */ + return 0; } int acl_IsAMember(aid,cps) Index: openafs/src/libadmin/adminutil/afs_AdminBosErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminBosErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminBosErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminBosErrors.et:1.2 Sat Nov 4 05:04:46 2000 --- openafs/src/libadmin/adminutil/afs_AdminBosErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table ab ec ADMBOSSERVERNAMENULL, "the bos server name cannot be NULL" ec ADMBOSSERVERHANDLEPNULL, "the bos server handle cannot be NULL" ec ADMBOSSERVERHANDLENULL, "the bos server handle cannot be NULL" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AB ec ADMBOSSERVERNAMENULL, "the bos server name cannot be NULL" ec ADMBOSSERVERHANDLEPNULL, "the bos server handle cannot be NULL" ec ADMBOSSERVERHANDLENULL, "the bos server handle cannot be NULL" Index: openafs/src/libadmin/adminutil/afs_AdminCfgErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminCfgErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminCfgErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminCfgErrors.et:1.2 Sat Nov 4 05:04:46 2000 --- openafs/src/libadmin/adminutil/afs_AdminCfgErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table af ec ADMCFGNOTSUPPORTED, "the specified configuration option is not yet supported" ec ADMCFGHOSTNAMENULL, "the host name parameter cannot be NULL" ec ADMCFGHOSTNAMETOOLONG, "the host name parameter exceeds the maximum allowed length" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AF ec ADMCFGNOTSUPPORTED, "the specified configuration option is not yet supported" ec ADMCFGHOSTNAMENULL, "the host name parameter cannot be NULL" ec ADMCFGHOSTNAMETOOLONG, "the host name parameter exceeds the maximum allowed length" Index: openafs/src/libadmin/adminutil/afs_AdminClientErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminClientErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminClientErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminClientErrors.et:1.2 Sat Nov 4 05:04:46 2000 --- openafs/src/libadmin/adminutil/afs_AdminClientErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table al ec ADMCLIENTCELLHANDLENULL, "the cell handle parameter cannot be NULL" ec ADMCLIENTCELLHANDLEPNULL, "the cell handle reference parameter cannot be NULL" ec ADMCLIENTCELLHANDLEBADMAGIC, "the server handle parameter failed to pass the magic number test. Most likely the server handle is invalid, or has been overwritten by mistake." --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AL ec ADMCLIENTCELLHANDLENULL, "the cell handle parameter cannot be NULL" ec ADMCLIENTCELLHANDLEPNULL, "the cell handle reference parameter cannot be NULL" ec ADMCLIENTCELLHANDLEBADMAGIC, "the server handle parameter failed to pass the magic number test. Most likely the server handle is invalid, or has been overwritten by mistake." Index: openafs/src/libadmin/adminutil/afs_AdminCommonErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminCommonErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminCommonErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminCommonErrors.et:1.2 Sat Nov 4 05:04:46 2000 --- openafs/src/libadmin/adminutil/afs_AdminCommonErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table ac ec ADMNOMEM, "couldn't allocate memory necessary to fulfill request" ec ADMNOPRIV, "insufficient privilege to complete operation" ec ADMMUTEXINIT, "failed to initialize a mutex" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AC ec ADMNOMEM, "couldn't allocate memory necessary to fulfill request" ec ADMNOPRIV, "insufficient privilege to complete operation" ec ADMMUTEXINIT, "failed to initialize a mutex" Index: openafs/src/libadmin/adminutil/afs_AdminKasErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminKasErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminKasErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminKasErrors.et:1.2 Sat Nov 4 05:04:47 2000 --- openafs/src/libadmin/adminutil/afs_AdminKasErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table ak ec ADMKASSERVERHANDLENULL, "the server handle parameter cannot be NULL" ec ADMKASSERVERHANDLEBADMAGIC, "the server handle parameter failed to pass the magic number test. Most likely the server handle is invalid, or has been overwritten by mistake." ec ADMKASSERVERHANDLENOTVALID, "the server handle parameter is marked invalid" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AK ec ADMKASSERVERHANDLENULL, "the server handle parameter cannot be NULL" ec ADMKASSERVERHANDLEBADMAGIC, "the server handle parameter failed to pass the magic number test. Most likely the server handle is invalid, or has been overwritten by mistake." ec ADMKASSERVERHANDLENOTVALID, "the server handle parameter is marked invalid" Index: openafs/src/libadmin/adminutil/afs_AdminMiscErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminMiscErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminMiscErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminMiscErrors.et:1.2 Sat Nov 4 05:04:47 2000 --- openafs/src/libadmin/adminutil/afs_AdminMiscErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table am ec ADMMISCDIRECTORYNULL, "the directory parameter cannot be NULL." ec ADMMISCUSERNULL, "the user parameter cannot be NULL." ec ADMMISCACLNULL, "the acl parameter cannot be NULL." --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AM ec ADMMISCDIRECTORYNULL, "the directory parameter cannot be NULL." ec ADMMISCUSERNULL, "the user parameter cannot be NULL." ec ADMMISCACLNULL, "the acl parameter cannot be NULL." Index: openafs/src/libadmin/adminutil/afs_AdminPtsErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminPtsErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminPtsErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminPtsErrors.et:1.2 Sat Nov 4 05:04:47 2000 --- openafs/src/libadmin/adminutil/afs_AdminPtsErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table ap ec ADMPTSSERVERNULL, "the protection server parameter cannot be NULL" ec ADMPTSUSERNAMENULL, "the user name parameter cannot be NULL" ec ADMPTSUSERNAMETOOLONG, "the user name parameter is too long" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AP ec ADMPTSSERVERNULL, "the protection server parameter cannot be NULL" ec ADMPTSUSERNAMENULL, "the user name parameter cannot be NULL" ec ADMPTSUSERNAMETOOLONG, "the user name parameter is too long" Index: openafs/src/libadmin/adminutil/afs_AdminUtilErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminUtilErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminUtilErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminUtilErrors.et:1.2 Sat Nov 4 05:04:47 2000 --- openafs/src/libadmin/adminutil/afs_AdminUtilErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table au ec ADMUTILSERVERENTRYPNULL, "the server entry parameter cannot be NULL" ec ADMUTILSERVERNAMENULL, "the server name parameter cannot be NULL" ec ADMUTILSERVERADDRESSNULL, "the server address parameter cannot be NULL" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AU ec ADMUTILSERVERENTRYPNULL, "the server entry parameter cannot be NULL" ec ADMUTILSERVERNAMENULL, "the server name parameter cannot be NULL" ec ADMUTILSERVERADDRESSNULL, "the server address parameter cannot be NULL" Index: openafs/src/libadmin/adminutil/afs_AdminVosErrors.et diff -c openafs/src/libadmin/adminutil/afs_AdminVosErrors.et:1.2 openafs/src/libadmin/adminutil/afs_AdminVosErrors.et:1.2.8.1 *** openafs/src/libadmin/adminutil/afs_AdminVosErrors.et:1.2 Sat Nov 4 05:04:47 2000 --- openafs/src/libadmin/adminutil/afs_AdminVosErrors.et Wed Sep 19 18:40:35 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table av ec ADMVOSSERVERNULL, "the volume server parameter cannot be NULL" ec ADMVOSCELLHANDLENULL, "the cell handle parameter cannot be NULL" ec ADMVOSCELLHANDLEBADMAGIC, "the cell handle parameter failed to pass the magic number test. Most likely the cell handle is invalid, or has been overwritten by mistake." --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table AV ec ADMVOSSERVERNULL, "the volume server parameter cannot be NULL" ec ADMVOSCELLHANDLENULL, "the cell handle parameter cannot be NULL" ec ADMVOSCELLHANDLEBADMAGIC, "the cell handle parameter failed to pass the magic number test. Most likely the cell handle is invalid, or has been overwritten by mistake." Index: openafs/src/libadmin/adminutil/afs_utilAdmin.c diff -c openafs/src/libadmin/adminutil/afs_utilAdmin.c:1.5 openafs/src/libadmin/adminutil/afs_utilAdmin.c:1.5.4.1 *** openafs/src/libadmin/adminutil/afs_utilAdmin.c:1.5 Thu Jul 12 15:58:41 2001 --- openafs/src/libadmin/adminutil/afs_utilAdmin.c Wed Sep 19 18:40:35 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/libadmin/adminutil/afs_utilAdmin.c,v 1.5 2001/07/12 19:58:41 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/libadmin/adminutil/afs_utilAdmin.c,v 1.5.4.1 2001/09/19 22:40:35 shadow Exp $"); #include #include *************** *** 59,83 **** static void init_once(void) { ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); ! initialize_pt_error_table(); ! initialize_bz_error_table(); ! initialize_u_error_table(); ! initialize_ab_error_table(); ! initialize_af_error_table(); ! initialize_al_error_table(); ! initialize_ac_error_table(); ! initialize_ak_error_table(); ! initialize_am_error_table(); ! initialize_ap_error_table(); ! initialize_au_error_table(); ! initialize_av_error_table(); ! initialize_vols_error_table(); error_init_done = 1; } --- 59,83 ---- static void init_once(void) { ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_CMD_error_table(); ! initialize_VL_error_table(); ! initialize_PT_error_table(); ! initialize_BZ_error_table(); ! initialize_U_error_table(); ! initialize_AB_error_table(); ! initialize_AF_error_table(); ! initialize_AL_error_table(); ! initialize_AC_error_table(); ! initialize_AK_error_table(); ! initialize_AM_error_table(); ! initialize_AP_error_table(); ! initialize_AU_error_table(); ! initialize_AV_error_table(); ! initialize_VOLS_error_table(); error_init_done = 1; } Index: openafs/src/libafs/MakefileProto.DARWIN.in diff -c openafs/src/libafs/MakefileProto.DARWIN.in:1.8.2.1 openafs/src/libafs/MakefileProto.DARWIN.in:1.8.2.2 *** openafs/src/libafs/MakefileProto.DARWIN.in:1.8.2.1 Wed Sep 12 01:03:53 2001 --- openafs/src/libafs/MakefileProto.DARWIN.in Thu Sep 20 16:12:35 2001 *************** *** 1,5 **** #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ ! # $Header: /data/cvs/openafs/src/libafs/MakefileProto.DARWIN.in,v 1.8.2.1 2001/09/12 05:03:53 shadow Exp $ # # MakefileProto for Digital Unix systems # --- 1,5 ---- #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ ! # $Header: /data/cvs/openafs/src/libafs/MakefileProto.DARWIN.in,v 1.8.2.2 2001/09/20 20:12:35 shadow Exp $ # # MakefileProto for Digital Unix systems # *************** *** 47,60 **** # System specific build commands and flags KDEFS= ! DBUG = -g DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL ! OPTF=${OPT} ! OPTF2=${OPT2} ! KOPTS=-traditional-cpp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch #CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} #CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ! CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} # Name of directory to hold object files and libraries. --- 47,58 ---- # System specific build commands and flags KDEFS= ! DBUG = DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL ! KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch #CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} #CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ! CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ} # Name of directory to hold object files and libraries. Index: openafs/src/libafs/MakefileProto.OBSD.in diff -c /dev/null openafs/src/libafs/MakefileProto.OBSD.in:1.1.2.1 *** /dev/null Fri Sep 21 20:05:52 2001 --- openafs/src/libafs/MakefileProto.OBSD.in Wed Sep 19 18:59:44 2001 *************** *** 0 **** --- 1,152 ---- + #/* Copyright (C) 1995, 1989 Transarc Corporation - All rights reserved */ + # + # MakefileProto for OpenBSD systems + # + DEST=@DEST@ + TOP_INCDIR=@TOP_INCDIR@ + TOP_LIBDIR=@TOP_LIBDIR@ + TOP_SRCDIR=@TOP_SRCDIR@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + bindir=@bindir@ + sbindir=@sbindir@ + libexecdir=@libexecdir@ + libdir=@libdir@ + includedir=@includedir@ + mandir=@mandir@ + afssrvbindir=@afssrvbindir@ + afssrvsbindir=@afssrvsbindir@ + afssrvlibexecdir=@afssrvlibexecdir@ + afskerneldir=@afskerneldir@ + SYS_NAME=@AFS_SYSNAME@ + + include ../config/Makefile.${SYS_NAME} + + # OS specific object files: + AFS_OS_OBJS = \ + osi_groups.o \ + osi_file.o \ + osi_inode.o \ + osi_misc.o \ + osi_sleep.o \ + osi_vm.o \ + osi_vnodeops.o \ + xdr_int64.o + + AFS_OS_NFSOBJS = \ + osi_vfsops_nfs.o + + AFS_OS_NONFSOBJS = \ + osi_vfsops.o + + + # System specific build commands and flags + # KDEFS=-DLANGUAGE_C -I/usr/sys/include -I../include \ + # -I/usr/src/sys/${HEADER_RT} -I/usr/src/sys/sys \ + # -DSWAPTYPE=1 -DUERF -DOSF -DCOMPAT_43 -DUFS \ + # -DRT -DKERNEL -D_KERNEL + KDEFS=-Wall -fformat-extensions -ansi -nostdinc -I/usr/include -D_KERNEL \ + -elf -mpreferred-stack-boundary=2 -I/usr/src/sys/sys -I../afs + DBUG = -O2 + DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT + OPTF=${OPT} + OPTF2=${OPT2} + CFLAGS=-I. -I.. -I${TOP_SRCDIR}/config ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} + + + # Name of directory to hold object files and libraries. + KOBJ = STATIC + + # This tells Makefile.common to use its single directory build target. + COMPDIRS = single_compdir + INSTDIRS = single_instdir + DESTDIRS = single_destdir + + include Makefile.common + + setup: + -mkdir $(KOBJ) + -$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config + ln -s ../Makefile $(KOBJ)/Makefile + ln -s ../Makefile.common $(KOBJ)/Makefile.common + ln -s ../config $(KOBJ)/config + -$(RM) -f h net netinet rpc ufs nfs machine sys vm + -ln -s /usr/src/sys/net net + -ln -s /usr/src/sys/i386/include machine + -ln -s /usr/src/sys/netinet netinet + -ln -s /usr/src/sys/nfs nfs + -ln -s /usr/include/rpc rpc + -ln -s /usr/src/sys/sys sys + -ln -s /usr/src/sys/ufs/ufs ufs + -ln -s /usr/src/sys/sys h + -ln -s /usr/src/sys/vm vm + -touch $(KOBJ)/sec_net.h + + + # Below this line are targets when in the COMMON directory: + LIBAFS = libafs.o + LIBAFSNONFS = libafs.nonfs.o + + INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS} + INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS} + + DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS} + DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS} + + + # libafs: $(LIBAFS) $(LIBAFSNONFS) + # libafs: $(LIBAFSNONFS) + # install_libafs: $(INST_LIBAFS) $(INST_LIBAFSNONFS) + # install_libafs: $(INST_LIBAFSNONFS) + # dest_libafs: $(DEST_LIBAFS) $(DEST_LIBAFSNONFS) + # dest_libafs: $(DEST_LIBAFSNONFS) + libafs: + echo WARNING: No kernel module for ${SYS_NAME} + + install_libafs: + echo WARNING: No kernel module for ${SYS_NAME} + + dest_libafs: + echo WARNING: No kernel module for ${SYS_NAME} + + + $(INST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + + $(INST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ + + $(DEST_LIBAFS): $(LIBAFS) + $(INSTALL) -f $? $@ + + $(DEST_LIBAFSNONFS): $(LIBAFSNONFS) + $(INSTALL) -f $? $@ + + ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) + $(LD) -r -o ${LIBAFS} ${AFSAOBJS} ${AFSNFSOBJS} + + ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) + $(LD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS} + + + # Object build rules: + osi_groups.o: $(AFS)/osi_groups.c + $(CRULE1) + osi_file.o: $(AFS)/osi_file.c + $(CRULE1) + osi_inode.o: $(AFS)/osi_inode.c + $(CRULE1) + osi_misc.o: $(AFS)/osi_misc.c + $(CRULE1) + osi_sleep.o: $(AFS)/osi_sleep.c + $(CRULE1) + osi_vfsops_nfs.o: $(AFS)/osi_vfsops.c + $(CRULE1) -o osi_vfsops_nfs.o + osi_vfsops.o: $(AFS)/osi_vfsops.c + $(CRULE1) -DAFS_NONFSTRANS + osi_vm.o: $(AFS)/osi_vm.c + $(CRULE1) + osi_vnodeops.o: $(AFS)/osi_vnodeops.c + $(CRULE1) + xdr_int64.o: $(RX)/xdr_int64.c + $(CRULE1) Index: openafs/src/lwp/Makefile.in diff -c openafs/src/lwp/Makefile.in:1.4 openafs/src/lwp/Makefile.in:1.4.2.1 *** openafs/src/lwp/Makefile.in:1.4 Fri Sep 7 19:35:29 2001 --- openafs/src/lwp/Makefile.in Wed Sep 19 18:25:25 2001 *************** *** 82,87 **** --- 82,92 ---- alpha_osf1 | alpha_osf20 | alpha_osf30 | alpha_osf32 | alpha_osf32c | alpha_dux?? ) \ ${AS} -v -P -DOSF -I${TOP_INCDIR} -DASSEMBLER process.s; \ ${AS} -v process.i -o process.o;; \ + *_obsd* ) \ + cp process.s process.S ; \ + ${CC} -E -I${TOP_INCDIR} process.S >process.ss ; \ + ${AS} process.ss -o process.o ; \ + $(RM) -f process.S ;;\ hp_ux110 ) \ ${CC} ${CFLAGS} -c process.c;; \ *) \ Index: openafs/src/lwp/preempt.c diff -c openafs/src/lwp/preempt.c:1.10 openafs/src/lwp/preempt.c:1.10.2.1 *** openafs/src/lwp/preempt.c:1.10 Tue Aug 7 20:03:52 2001 --- openafs/src/lwp/preempt.c Wed Sep 19 18:25:25 2001 *************** *** 16,25 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/preempt.c,v 1.10 2001/08/08 00:03:52 shadow Exp $"); ! #if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || defined(AFS_DJGPP_ENV) int PRE_Block = 0; #else #include --- 16,25 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/preempt.c,v 1.10.2.1 2001/09/19 22:25:25 shadow Exp $"); ! #if defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_DJGPP_ENV) int PRE_Block = 0; #else #include Index: openafs/src/lwp/process.s diff -c openafs/src/lwp/process.s:1.7 openafs/src/lwp/process.s:1.7.4.1 *** openafs/src/lwp/process.s:1.7 Sat Jun 23 13:26:11 2001 --- openafs/src/lwp/process.s Wed Sep 19 18:25:25 2001 *************** *** 349,357 **** --- 349,365 ---- #include #include #else + #ifdef AFS_XBSD_ENV + #include + #define ST_FLUSH_WINDOWS ST_FLUSHWIN + #define MINFRAME 92 + #define SA(x) (((x)+7)&~7) + #define STACK_ALIGN 8 + #else /* SunOS 4: */ #include #include #endif + #endif .data #ifdef AFS_SUN5_ENV .globl PRE_Block *************** *** 1153,1159 **** END(returnto) #endif ! #if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV) /* Sun 386i... I hope this does the right thing!!! * * Written by Derek Atkins --- 1161,1167 ---- END(returnto) #endif ! #if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) /* Sun 386i... I hope this does the right thing!!! * * Written by Derek Atkins *************** *** 1187,1193 **** .set newsp,16 ! #ifdef AFS_DJGPP_ENV .globl _PRE_Block .globl _savecontext _savecontext: --- 1195,1201 ---- .set newsp,16 ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) .globl _PRE_Block .globl _savecontext _savecontext: *************** *** 1199,1205 **** pushl %ebp /* New Frame! */ movl %esp,%ebp pusha /* Push all registers */ ! #ifdef AFS_DJGPP_ENV movl $1,_PRE_Block /* Pre-emption code */ #else movl $1,PRE_Block /* Pre-emption code */ --- 1207,1213 ---- pushl %ebp /* New Frame! */ movl %esp,%ebp pusha /* Push all registers */ ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) movl $1,_PRE_Block /* Pre-emption code */ #else movl $1,PRE_Block /* Pre-emption code */ *************** *** 1215,1221 **** /* Shouldnt be here....*/ ! #ifdef AFS_DJGPP_ENV call _abort #else call abort --- 1223,1229 ---- /* Shouldnt be here....*/ ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) call _abort #else call abort *************** *** 1229,1235 **** /* stack offset */ .set area2,8 ! #ifdef AFS_DJGPP_ENV .globl _returnto _returnto: #else --- 1237,1243 ---- /* stack offset */ .set area2,8 ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) .globl _returnto _returnto: #else *************** *** 1241,1247 **** movl area2(%ebp),%eax /* eax = area2 */ movl (%eax),%esp /* restore esp */ popa ! #ifdef AFS_DJGPP_ENV movl $0,_PRE_Block /* clear it up... */ #else movl $0,PRE_Block /* clear it up... */ --- 1249,1255 ---- movl area2(%ebp),%eax /* eax = area2 */ movl (%eax),%esp /* restore esp */ popa ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) movl $0,_PRE_Block /* clear it up... */ #else movl $0,PRE_Block /* clear it up... */ *************** *** 1251,1257 **** /* I see, said the blind man, as he picked up his hammer and saw! */ pushl $1234 ! #ifdef AFS_DJGPP_ENV call _abort #else call abort --- 1259,1265 ---- /* I see, said the blind man, as he picked up his hammer and saw! */ pushl $1234 ! #if defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV) call _abort #else call abort Index: openafs/src/lwp/waitkey.c diff -c openafs/src/lwp/waitkey.c:1.8 openafs/src/lwp/waitkey.c:1.8.2.1 *** openafs/src/lwp/waitkey.c:1.8 Thu Jul 19 17:51:49 2001 --- openafs/src/lwp/waitkey.c Wed Sep 19 18:25:25 2001 *************** *** 22,28 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/waitkey.c,v 1.8 2001/07/19 21:51:49 shadow Exp $"); #include #include --- 22,28 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/lwp/waitkey.c,v 1.8.2.1 2001/09/19 22:25:25 shadow Exp $"); #include #include *************** *** 164,170 **** if (stdin->_IO_read_ptr < stdin->_IO_read_end) return 1; #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) if (stdin->_bf._size > 0) return 1; #else --- 164,170 ---- if (stdin->_IO_read_ptr < stdin->_IO_read_end) return 1; #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if (stdin->_bf._size > 0) return 1; #else Index: openafs/src/package/package.c diff -c openafs/src/package/package.c:1.1 openafs/src/package/package.c:1.1.12.1 *** openafs/src/package/package.c:1.1 Fri Nov 3 21:28:32 2000 --- openafs/src/package/package.c Wed Sep 19 18:40:37 2001 *************** *** 338,344 **** /* * Set up the appropriate error tables. */ ! initialize_cmd_error_table(); /* * Parse command line switches & execute the command, then get the --- 338,344 ---- /* * Set up the appropriate error tables. */ ! initialize_CMD_error_table(); /* * Parse command line switches & execute the command, then get the Index: openafs/src/pinstall/install.c diff -c openafs/src/pinstall/install.c:1.9 openafs/src/pinstall/install.c:1.9.2.1 *** openafs/src/pinstall/install.c:1.9 Tue Aug 7 20:03:53 2001 --- openafs/src/pinstall/install.c Wed Sep 19 18:25:26 2001 *************** *** 49,55 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/pinstall/install.c,v 1.9 2001/08/08 00:03:53 shadow Exp $"); #include #include --- 49,55 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/pinstall/install.c,v 1.9.2.1 2001/09/19 22:25:26 shadow Exp $"); #include #include *************** *** 89,95 **** #if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) extern char *sys_errlist[]; #endif ! #if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) extern struct passwd *getpwnam(); int stripcalled = 0; #endif --- 89,95 ---- #if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) extern char *sys_errlist[]; #endif ! #if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) extern struct passwd *getpwnam(); int stripcalled = 0; #endif *************** *** 152,158 **** return value; } ! #if defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) /* * Implementation lifted from that for AIX 3.1, since there didn't seem to be any * reason why it wouldn't work. --- 152,158 ---- return value; } ! #if defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) /* * Implementation lifted from that for AIX 3.1, since there didn't seem to be any * reason why it wouldn't work. *************** *** 204,209 **** --- 204,210 ---- return -1; } + #ifndef AFS_OBSD_ENV /* * done the copy, now strip if desired. */ *************** *** 234,239 **** --- 235,241 ---- return -1; } } + #endif return status; } *************** *** 473,479 **** #endif /* AFS_HPUX_ENV */ char pnametmp[1024]; int pnamelen; ! #if defined (AFS_AIX_ENV) || defined(AFS_FBSD_ENV) afs_int32 newcode; static char diskBuffer[BUFSIZE]; /* must be static to avoid compiler bugs for large stuff */ #endif --- 475,481 ---- #endif /* AFS_HPUX_ENV */ char pnametmp[1024]; int pnamelen; ! #if defined (AFS_AIX_ENV) || defined(AFS_XBSD_ENV) afs_int32 newcode; static char diskBuffer[BUFSIZE]; /* must be static to avoid compiler bugs for large stuff */ #endif *************** *** 684,690 **** continue; } } ! #if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) stripcalled = 0; if (strip == 1 || ((strip == -1 && ((istat.st_mode & 0111) == 0111) && stripName(newNames[i])) && AIXobject(fnames[i]))) --- 686,692 ---- continue; } } ! #if defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_OBSD_ENV) stripcalled = 0; if (strip == 1 || ((strip == -1 && ((istat.st_mode & 0111) == 0111) && stripName(newNames[i])) && AIXobject(fnames[i]))) Index: openafs/src/ptserver/Makefile.in diff -c openafs/src/ptserver/Makefile.in:1.4 openafs/src/ptserver/Makefile.in:1.4.2.1 *** openafs/src/ptserver/Makefile.in:1.4 Fri Sep 7 19:35:41 2001 --- openafs/src/ptserver/Makefile.in Wed Sep 19 18:40:37 2001 *************** *** 147,153 **** prerror.h: pterror.h ${INSTALL} $? $@ ! echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt' >> $@ # # Installation targets --- 147,153 ---- prerror.h: pterror.h ${INSTALL} $? $@ ! echo '#define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_PT' >> $@ # # Installation targets Index: openafs/src/ptserver/NTMakefile diff -c openafs/src/ptserver/NTMakefile:1.3 openafs/src/ptserver/NTMakefile:1.3.4.1 *** openafs/src/ptserver/NTMakefile:1.3 Mon Apr 30 03:03:35 2001 --- openafs/src/ptserver/NTMakefile Wed Sep 19 18:40:37 2001 *************** *** 51,58 **** ptprocs.obj \ utils.obj \ ptserver.res - PTSERVER_EXELIBS =\ $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afsauth.lib \ --- 51,58 ---- ptprocs.obj \ utils.obj \ ptserver.res + PTSERVER_EXELIBS =\ $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afsauth.lib \ *************** *** 163,169 **** $(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h $(COPY) $(INCFILEDIR)\afs\ptclient.h $(INCFILEDIR)\afs\prclient.h ! $(ECHO) #define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_pt >> $(INCFILEDIR)\afs\prclient.h ############################################################################ # clean up --- 163,169 ---- $(INCFILEDIR)\afs\prclient.h: $(INCFILEDIR)\afs\ptclient.h $(COPY) $(INCFILEDIR)\afs\ptclient.h $(INCFILEDIR)\afs\prclient.h ! $(ECHO) #define ERROR_TABLE_BASE_pr ERROR_TABLE_BASE_PT >> $(INCFILEDIR)\afs\prclient.h ############################################################################ # clean up *************** *** 180,186 **** readgroup.exe: readgroup.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) ! readpwd.exe: readpwd.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) --- 180,186 ---- readgroup.exe: readgroup.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) ! readpwd.exe: readpwd.obj $(LIBFILE) $(TEST_LIBS) $(EXECONLINK) Index: openafs/src/ptserver/db_verify.c diff -c openafs/src/ptserver/db_verify.c:1.6 openafs/src/ptserver/db_verify.c:1.6.2.2 *** openafs/src/ptserver/db_verify.c:1.6 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/db_verify.c Wed Sep 19 18:40:37 2001 *************** *** 12,18 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/db_verify.c,v 1.6 2001/08/08 00:03:54 shadow Exp $"); #include #include --- 12,18 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/db_verify.c,v 1.6.2.2 2001/09/19 22:40:37 shadow Exp $"); #include #include *************** *** 222,228 **** struct prentry *e; int indent; { - int i; pr_PrintEntry (stderr, /*net order*/0, ea, e, indent); return 0; --- 222,227 ---- *************** *** 1044,1055 **** afs_int32 code; char *recreateFile; struct misc_data misc; /* info & statistics */ - - int a; - char arg[100]; ! initialize_pt_error_table(); ! initialize_u_error_table(); pr_dbaseName = AFSDIR_SERVER_PRDB_FILEPATH; memset(&misc, 0, sizeof(misc)); --- 1043,1051 ---- afs_int32 code; char *recreateFile; struct misc_data misc; /* info & statistics */ ! initialize_PT_error_table(); ! initialize_U_error_table(); pr_dbaseName = AFSDIR_SERVER_PRDB_FILEPATH; memset(&misc, 0, sizeof(misc)); *************** *** 1099,1105 **** char *argv[]; { struct cmd_syndesc *ts; - struct cmd_item *ti; setlinebuf(stdout); --- 1095,1100 ---- Index: openafs/src/ptserver/display.c diff -c openafs/src/ptserver/display.c:1.4 openafs/src/ptserver/display.c:1.4.4.1 *** openafs/src/ptserver/display.c:1.4 Thu Jul 12 15:58:54 2001 --- openafs/src/ptserver/display.c Wed Sep 19 18:36:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/display.c,v 1.4 2001/07/12 19:58:54 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/display.c,v 1.4.4.1 2001/09/19 22:36:25 shadow Exp $"); #include #include *************** *** 32,38 **** { struct tm *tm; static char buffer[32]; static int this_year = 0; - char year[6]; if (clock == 0) return "time-not-set "; if (!this_year) { --- 32,37 ---- Index: openafs/src/ptserver/pt_util.c diff -c openafs/src/ptserver/pt_util.c:1.3 openafs/src/ptserver/pt_util.c:1.3.4.1 *** openafs/src/ptserver/pt_util.c:1.3 Thu Jul 12 15:58:54 2001 --- openafs/src/ptserver/pt_util.c Wed Sep 19 18:40:38 2001 *************** *** 1,4 **** ! /* $Id: pt_util.c,v 1.3 2001/07/12 19:58:54 shadow Exp $ */ /* * --- 1,4 ---- ! /* $Id: pt_util.c,v 1.3.4.1 2001/09/19 22:40:38 shadow Exp $ */ /* * *************** *** 21,27 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/pt_util.c,v 1.3 2001/07/12 19:58:54 shadow Exp $"); #include #include --- 21,27 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/pt_util.c,v 1.3.4.1 2001/09/19 22:40:38 shadow Exp $"); #include #include *************** *** 193,199 **** } Initdb(); ! initialize_pt_error_table(); if (wflag) { struct usr_list *u; --- 193,199 ---- } Initdb(); ! initialize_PT_error_table(); if (wflag) { struct usr_list *u; Index: openafs/src/ptserver/ptclient.c diff -c openafs/src/ptserver/ptclient.c:1.5 openafs/src/ptserver/ptclient.c:1.5.2.1 *** openafs/src/ptserver/ptclient.c:1.5 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/ptclient.c Wed Sep 19 18:40:38 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptclient.c,v 1.5 2001/08/08 00:03:54 shadow Exp $"); #ifdef AFS_AIX32_ENV #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptclient.c,v 1.5.2.1 2001/09/19 22:40:38 shadow Exp $"); #ifdef AFS_AIX32_ENV #include *************** *** 184,190 **** #endif whoami = argv[0]; ! initialize_pt_error_table(); strcpy(confdir, AFSDIR_CLIENT_ETC_DIRPATH); cell = 0; --- 184,190 ---- #endif whoami = argv[0]; ! initialize_PT_error_table(); strcpy(confdir, AFSDIR_CLIENT_ETC_DIRPATH); cell = 0; Index: openafs/src/ptserver/pterror.et diff -c openafs/src/ptserver/pterror.et:1.2 openafs/src/ptserver/pterror.et:1.2.8.1 *** openafs/src/ptserver/pterror.et:1.2 Sat Nov 4 05:05:23 2000 --- openafs/src/ptserver/pterror.et Wed Sep 19 18:40:38 2001 *************** *** 12,18 **** # NOTE: PRPERM value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table pt ec PREXIST, "Entry for name already exists" ec PRIDEXIST, "Entry for id already exists" ec PRNOIDS, "Couldn't allocate an id for this entry" --- 12,18 ---- # NOTE: PRPERM value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table PT ec PREXIST, "Entry for name already exists" ec PRIDEXIST, "Entry for id already exists" ec PRNOIDS, "Couldn't allocate an id for this entry" Index: openafs/src/ptserver/ptprocs.c diff -c openafs/src/ptserver/ptprocs.c:1.7 openafs/src/ptserver/ptprocs.c:1.7.2.1 *** openafs/src/ptserver/ptprocs.c:1.7 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/ptprocs.c Wed Sep 19 18:36:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptprocs.c,v 1.7 2001/08/08 00:03:54 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptprocs.c,v 1.7.2.1 2001/09/19 22:36:25 shadow Exp $"); #include #include *************** *** 1194,1200 **** afs_int32 code; struct ubik_trans *tt; afs_int32 cid; ! afs_int32 temp, i, eof, pos, maxentries, f; struct prentry tentry; afs_int32 pollcount=0; --- 1194,1200 ---- afs_int32 code; struct ubik_trans *tt; afs_int32 cid; ! afs_int32 i, eof, pos, maxentries, f; struct prentry tentry; afs_int32 pollcount=0; Index: openafs/src/ptserver/ptserver.c diff -c openafs/src/ptserver/ptserver.c:1.9 openafs/src/ptserver/ptserver.c:1.9.2.1 *** openafs/src/ptserver/ptserver.c:1.9 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/ptserver.c Wed Sep 19 18:36:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptserver.c,v 1.9 2001/08/08 00:03:54 shadow Exp $"); #include #ifdef AFS_AIX32_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptserver.c,v 1.9.2.1 2001/09/19 22:36:25 shadow Exp $"); #include #ifdef AFS_AIX32_ENV *************** *** 81,87 **** #endif struct afsconf_cell info; int kerberosKeys; /* set if found some keys */ - afs_int32 i,j; int lwps = 3; char clones[MAXHOSTSPERCELL]; --- 81,86 ---- *************** *** 157,164 **** } #endif else if (*arg == '-') { - usage: - /* hack in help flag support */ #ifndef AFS_NT40_ENV --- 156,161 ---- Index: openafs/src/ptserver/ptuser.c diff -c openafs/src/ptserver/ptuser.c:1.6 openafs/src/ptserver/ptuser.c:1.6.2.1 *** openafs/src/ptserver/ptuser.c:1.6 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/ptuser.c Wed Sep 19 18:40:38 2001 *************** *** 14,20 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptuser.c,v 1.6 2001/08/08 00:03:54 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 14,20 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/ptserver/ptuser.c,v 1.6.2.1 2001/09/19 22:40:38 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 71,84 **** afs_int32 i; char cellstr[64]; ! initialize_pt_error_table(); ! initialize_rxk_error_table(); ! initialize_acfg_error_table(); ! initialize_ktc_error_table(); ! /* ! initialize_lwp_error_table(); ! initialize_rx_error_table(); ! */ if (strcmp(confDir, tconfDir)) { /* --- 71,80 ---- afs_int32 i; char cellstr[64]; ! initialize_PT_error_table(); ! initialize_RXK_error_table(); ! initialize_ACFG_error_table(); ! initialize_KTC_error_table(); if (strcmp(confDir, tconfDir)) { /* Index: openafs/src/ptserver/readgroup.c diff -c openafs/src/ptserver/readgroup.c:1.5 openafs/src/ptserver/readgroup.c:1.5.2.1 *** openafs/src/ptserver/readgroup.c:1.5 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/readgroup.c Wed Sep 19 18:36:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/readgroup.c,v 1.5 2001/08/08 00:03:54 shadow Exp $"); #include #ifndef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/readgroup.c,v 1.5.2.1 2001/09/19 22:36:25 shadow Exp $"); #include #ifndef AFS_NT40_ENV *************** *** 27,33 **** --- 27,35 ---- #include "pterror.h" int verbose = 0; + void skip(); + void report_error (code, name, gname) afs_int32 code; char *name; *************** *** 66,72 **** char buf[3000]; FILE *fp; char *ptr; - char *aptr; char *tmp; char *cellname; namelist lnames; --- 68,73 ---- *************** *** 195,200 **** --- 196,202 ---- } } + void skip(s) char **s; { Index: openafs/src/ptserver/testpt.c diff -c openafs/src/ptserver/testpt.c:1.6 openafs/src/ptserver/testpt.c:1.6.2.1 *** openafs/src/ptserver/testpt.c:1.6 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/testpt.c Wed Sep 19 18:40:38 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/testpt.c,v 1.6 2001/08/08 00:03:54 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/testpt.c,v 1.6.2.1 2001/09/19 22:40:38 shadow Exp $"); #include #include *************** *** 990,1001 **** struct cmd_syndesc *ts; /* ptr to parsed command line syntax */ whoami = argv[0]; ! initialize_cmd_error_table(); ! initialize_acfg_error_table(); ! initialize_ktc_error_table(); ! initialize_u_error_table(); ! initialize_pt_error_table(); ! initialize_rxk_error_table(); #ifdef AFS_NT40_ENV /* initialize winsock */ --- 990,1001 ---- struct cmd_syndesc *ts; /* ptr to parsed command line syntax */ whoami = argv[0]; ! initialize_CMD_error_table(); ! initialize_ACFG_error_table(); ! initialize_KTC_error_table(); ! initialize_U_error_table(); ! initialize_PT_error_table(); ! initialize_RXK_error_table(); #ifdef AFS_NT40_ENV /* initialize winsock */ Index: openafs/src/ptserver/utils.c diff -c openafs/src/ptserver/utils.c:1.7 openafs/src/ptserver/utils.c:1.7.2.1 *** openafs/src/ptserver/utils.c:1.7 Tue Aug 7 20:03:54 2001 --- openafs/src/ptserver/utils.c Wed Sep 19 18:36:25 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/utils.c,v 1.7 2001/08/08 00:03:54 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ptserver/utils.c,v 1.7.2.1 2001/09/19 22:36:25 shadow Exp $"); #include #include *************** *** 402,408 **** char aname[PR_MAXNAMELEN]; afs_int32 *aid; { - register afs_int32 code; afs_int32 temp; struct prentry tentry; --- 402,407 ---- Index: openafs/src/rx/rx_getaddr.c diff -c openafs/src/rx/rx_getaddr.c:1.9 openafs/src/rx/rx_getaddr.c:1.9.4.1 *** openafs/src/rx/rx_getaddr.c:1.9 Thu Jul 12 15:58:56 2001 --- openafs/src/rx/rx_getaddr.c Wed Sep 19 18:25:28 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_getaddr.c,v 1.9 2001/07/12 19:58:56 shadow Exp $"); #ifndef AFS_DJGPP_ENV #ifndef KERNEL --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_getaddr.c,v 1.9.4.1 2001/09/19 22:25:28 shadow Exp $"); #ifndef AFS_DJGPP_ENV #ifndef KERNEL *************** *** 21,27 **** #include #include #include ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #include --- 21,27 ---- #include #include #include ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #include *************** *** 108,114 **** #undef socket #endif /* UKERNEL */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) --- 108,114 ---- #undef socket #endif /* UKERNEL */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) *************** *** 135,141 **** /* this function returns the total number of interface addresses ** the buffer has to be passed in by the caller */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) int rx_getAllAddr (buffer,maxSize) afs_int32 buffer[]; int maxSize; /* sizeof of buffer in afs_int32 units */ --- 135,141 ---- /* this function returns the total number of interface addresses ** the buffer has to be passed in by the caller */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int rx_getAllAddr (buffer,maxSize) afs_int32 buffer[]; int maxSize; /* sizeof of buffer in afs_int32 units */ *************** *** 342,354 **** len = ifc.ifc_len / sizeof(struct ifreq); if (len > NIFS) len = NIFS; ! #if defined(AFS_AIX41_ENV) || defined (AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) if ( ifc.ifc_len > sizeof(ifs) ) /* safety check */ ifc.ifc_len = sizeof(ifs); for ( cp = (char *)ifc.ifc_buf, cplim= ifc.ifc_buf+ifc.ifc_len; cp < cplim; ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) cp += _SIZEOF_ADDR_IFREQ(*ifr)) #else cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a))) --- 342,354 ---- len = ifc.ifc_len / sizeof(struct ifreq); if (len > NIFS) len = NIFS; ! #if defined(AFS_AIX41_ENV) || defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) if ( ifc.ifc_len > sizeof(ifs) ) /* safety check */ ifc.ifc_len = sizeof(ifs); for ( cp = (char *)ifc.ifc_buf, cplim= ifc.ifc_buf+ifc.ifc_len; cp < cplim; ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) cp += _SIZEOF_ADDR_IFREQ(*ifr)) #else cp += sizeof(ifr->ifr_name) + MAX(a->sin_len, sizeof(*a))) Index: openafs/src/rx/rx_kcommon.c diff -c openafs/src/rx/rx_kcommon.c:1.9 openafs/src/rx/rx_kcommon.c:1.9.2.1 *** openafs/src/rx/rx_kcommon.c:1.9 Wed Aug 8 00:42:42 2001 --- openafs/src/rx/rx_kcommon.c Wed Sep 19 18:25:28 2001 *************** *** 14,20 **** #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_kcommon.c,v 1.9 2001/08/08 04:42:42 shadow Exp $"); #include "../rx/rx_kcommon.h" --- 14,20 ---- #include #include "../afs/param.h" ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_kcommon.c,v 1.9.2.1 2001/09/19 22:25:28 shadow Exp $"); #include "../rx/rx_kcommon.h" *************** *** 427,433 **** */ ! #if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX20_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_FBSD_ENV) /* Routine called during the afsd "-shutdown" process to put things back to * the initial state. */ --- 427,433 ---- */ ! #if ! defined(AFS_AIX_ENV) && ! defined(AFS_SUN5_ENV) && ! defined(UKERNEL) && ! defined(AFS_LINUX20_ENV) && !defined (AFS_DARWIN_ENV) && !defined (AFS_XBSD_ENV) /* Routine called during the afsd "-shutdown" process to put things back to * the initial state. */ *************** *** 552,558 **** #else /* AFS_USERSPACE_IP_ADDR */ ! #if !defined(AFS_AIX41_ENV) && !defined(AFS_DUX40_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #define IFADDR2SA(f) (&((f)->ifa_addr)) #else /* AFS_AIX41_ENV */ #define IFADDR2SA(f) ((f)->ifa_addr) --- 552,558 ---- #else /* AFS_USERSPACE_IP_ADDR */ ! #if !defined(AFS_AIX41_ENV) && !defined(AFS_DUX40_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #define IFADDR2SA(f) (&((f)->ifa_addr)) #else /* AFS_AIX41_ENV */ #define IFADDR2SA(f) ((f)->ifa_addr) *************** *** 573,586 **** memset(addrs, 0, sizeof(addrs)); memset(mtus, 0, sizeof(mtus)); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) TAILQ_FOREACH(ifn, &ifnet, if_link) { if (i >= ADDRSPERSITE) break; #else for (ifn = ifnet; ifn != NULL && i < ADDRSPERSITE; ifn = ifn->if_next) { #endif rxmtu = (ifn->if_mtu - RX_IPUDP_SIZE); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) TAILQ_FOREACH(ifad, &ifn->if_addrhead, ifa_link) { if (i >= ADDRSPERSITE) break; #else --- 573,586 ---- memset(addrs, 0, sizeof(addrs)); memset(mtus, 0, sizeof(mtus)); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) TAILQ_FOREACH(ifn, &ifnet, if_link) { if (i >= ADDRSPERSITE) break; #else for (ifn = ifnet; ifn != NULL && i < ADDRSPERSITE; ifn = ifn->if_next) { #endif rxmtu = (ifn->if_mtu - RX_IPUDP_SIZE); ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) TAILQ_FOREACH(ifad, &ifn->if_addrhead, ifa_link) { if (i >= ADDRSPERSITE) break; #else *************** *** 640,646 **** /* if we're given an address, skip everything until we find it */ if (!*pifad) ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) *pifad = TAILQ_FIRST(&in_ifaddrhead); #else *pifad = in_ifaddr; --- 640,646 ---- /* if we're given an address, skip everything until we find it */ if (!*pifad) ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) *pifad = TAILQ_FIRST(&in_ifaddrhead); #else *pifad = in_ifaddr; *************** *** 648,661 **** else { if (((ppaddr & (*pifad)->ia_subnetmask) == (*pifad)->ia_subnet)) match_value = 2; /* don't find matching nets, just subnets */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) *pifad = TAILQ_NEXT(*pifad, ia_link); #else *pifad = (*pifad)->ia_next; #endif } ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) for (ifa = *pifad; ifa; ifa = TAILQ_NEXT(ifa, ia_link) ) { #else for (ifa = *pifad; ifa; ifa = ifa->ia_next ) { --- 648,661 ---- else { if (((ppaddr & (*pifad)->ia_subnetmask) == (*pifad)->ia_subnet)) match_value = 2; /* don't find matching nets, just subnets */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) *pifad = TAILQ_NEXT(*pifad, ia_link); #else *pifad = (*pifad)->ia_next; #endif } ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) for (ifa = *pifad; ifa; ifa = TAILQ_NEXT(ifa, ia_link) ) { #else for (ifa = *pifad; ifa; ifa = ifa->ia_next ) { *************** *** 717,723 **** #endif AFS_STATCNT(osi_NewSocket); ! #if (defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)) && defined(KERNEL_FUNNEL) thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL); #endif #if defined(AFS_HPUX102_ENV) --- 717,723 ---- #endif AFS_STATCNT(osi_NewSocket); ! #if (defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)) && defined(KERNEL_FUNNEL) thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL); #endif #if defined(AFS_HPUX102_ENV) *************** *** 730,736 **** #else #ifdef AFS_SGI65_ENV code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP); ! #elif defined(AFS_FBSD_ENV) code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP, curproc); #else code = socreate(AF_INET, &newSocket, SOCK_DGRAM, 0); --- 730,736 ---- #else #ifdef AFS_SGI65_ENV code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP); ! #elif defined(AFS_XBSD_ENV) code = socreate(AF_INET, &newSocket, SOCK_DGRAM,IPPROTO_UDP, curproc); #else code = socreate(AF_INET, &newSocket, SOCK_DGRAM, 0); *************** *** 766,774 **** if (code) osi_Panic("osi_NewSocket: last attempt to reserve 32K failed!\n"); } ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) myaddr.sin_len = sizeof(myaddr); ! #if defined(AFS_FBSD_ENV) code = sobind(newSocket, (struct sockaddr *)&myaddr, curproc); #else code = sobind(newSocket, (struct sockaddr *)&myaddr); --- 766,774 ---- if (code) osi_Panic("osi_NewSocket: last attempt to reserve 32K failed!\n"); } ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) myaddr.sin_len = sizeof(myaddr); ! #if defined(AFS_XBSD_ENV) code = sobind(newSocket, (struct sockaddr *)&myaddr, curproc); #else code = sobind(newSocket, (struct sockaddr *)&myaddr); *************** *** 785,791 **** nam = m_get(M_WAIT, MT_SONAME); #endif if (nam == NULL) { ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_OSF_ENV) && !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV) setuerror(ENOBUFS); #endif goto bad; --- 785,791 ---- nam = m_get(M_WAIT, MT_SONAME); #endif if (nam == NULL) { ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_OSF_ENV) && !defined(AFS_SGI64_ENV) && !defined(AFS_XBSD_ENV) setuerror(ENOBUFS); #endif goto bad; *************** *** 799,805 **** BHV_PDATA(&bhv) = (void*)newSocket; code = sobind(&bhv, nam); m_freem(nam); ! #elif defined(AFS_FBSD_ENV) code = sobind(newSocket, nam, curproc); #else code = sobind(newSocket, nam); --- 799,805 ---- BHV_PDATA(&bhv) = (void*)newSocket; code = sobind(&bhv, nam); m_freem(nam); ! #elif defined(AFS_XBSD_ENV) code = sobind(newSocket, nam, curproc); #else code = sobind(newSocket, nam); *************** *** 1000,1006 **** #ifdef AFS_SUN5_ENV rxk_ListenerPid = ttoproc(curthread)->p_pidp->pid_id; #endif /* AFS_SUN5_ENV */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) rxk_ListenerPid = current_proc()->p_pid; #endif #if defined(RX_ENABLE_LOCKS) && !defined(AFS_SUN5_ENV) --- 1000,1006 ---- #ifdef AFS_SUN5_ENV rxk_ListenerPid = ttoproc(curthread)->p_pidp->pid_id; #endif /* AFS_SUN5_ENV */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) rxk_ListenerPid = current_proc()->p_pid; #endif #if defined(RX_ENABLE_LOCKS) && !defined(AFS_SUN5_ENV) *************** *** 1042,1048 **** #endif /* AFS_SUN5_ENV */ } ! #if !defined(AFS_LINUX20_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) /* The manner of stopping the rx listener thread may vary. Most unix's should * be able to call soclose. */ --- 1042,1048 ---- #endif /* AFS_SUN5_ENV */ } ! #if !defined(AFS_LINUX20_ENV) && !defined(AFS_SUN5_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) /* The manner of stopping the rx listener thread may vary. Most unix's should * be able to call soclose. */ Index: openafs/src/rx/rx_kcommon.h diff -c openafs/src/rx/rx_kcommon.h:1.4 openafs/src/rx/rx_kcommon.h:1.4.4.1 *** openafs/src/rx/rx_kcommon.h:1.4 Sat Apr 14 13:28:42 2001 --- openafs/src/rx/rx_kcommon.h Wed Sep 19 18:25:28 2001 *************** *** 35,53 **** #ifndef AFS_LINUX22_ENV #include "../h/socketvar.h" #include "../h/protosw.h" ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_FBSD_ENV) #include "../h/domain.h" #include "../h/dir.h" #include "../h/buf.h" #include "../h/mbuf.h" #else ! #if defined(AFS_FBSD_ENV) #include "../h/dirent.h" #include "../h/socket.h" #include "../h/domain.h" #include "../h/buf.h" #include "../h/mbuf.h" ! #endif /* AFS_FBSD_ENV */ #endif #endif /* AFS_LINUX22_ENV */ #ifdef AFS_SGI62_ENV --- 35,53 ---- #ifndef AFS_LINUX22_ENV #include "../h/socketvar.h" #include "../h/protosw.h" ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV) #include "../h/domain.h" #include "../h/dir.h" #include "../h/buf.h" #include "../h/mbuf.h" #else ! #if defined(AFS_XBSD_ENV) #include "../h/dirent.h" #include "../h/socket.h" #include "../h/domain.h" #include "../h/buf.h" #include "../h/mbuf.h" ! #endif /* AFS_XBSD_ENV */ #endif #endif /* AFS_LINUX22_ENV */ #ifdef AFS_SGI62_ENV *************** *** 114,121 **** extern int rxk_initDone; ! #if defined(AFS_FBSD_ENV) extern struct domain inetdomain; ! #endif /* AFS_FBSD_ENV */ #endif /* _RX_KCOMMON_H_ */ --- 114,121 ---- extern int rxk_initDone; ! #if defined(AFS_XBSD_ENV) extern struct domain inetdomain; ! #endif /* AFS_XBSD_ENV */ #endif /* _RX_KCOMMON_H_ */ Index: openafs/src/rx/rx_packet.h diff -c openafs/src/rx/rx_packet.h:1.7 openafs/src/rx/rx_packet.h:1.7.2.1 *** openafs/src/rx/rx_packet.h:1.7 Fri Sep 7 16:47:57 2001 --- openafs/src/rx/rx_packet.h Wed Sep 19 18:25:28 2001 *************** *** 41,47 **** #define MAX(a,b) ((a)>(b)?(a):(b)) #endif #else /* AFS_NT40_ENV */ ! #if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_USR_FBSD_ENV) #include /* MIN, MAX on Solaris */ #endif #include /* MIN, MAX elsewhere */ --- 41,47 ---- #define MAX(a,b) ((a)>(b)?(a):(b)) #endif #else /* AFS_NT40_ENV */ ! #if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) #include /* MIN, MAX on Solaris */ #endif #include /* MIN, MAX elsewhere */ Index: openafs/src/rx/rx_pthread.c diff -c openafs/src/rx/rx_pthread.c:1.6 openafs/src/rx/rx_pthread.c:1.6.4.1 *** openafs/src/rx/rx_pthread.c:1.6 Thu Jul 12 15:58:56 2001 --- openafs/src/rx/rx_pthread.c Wed Sep 19 18:36:26 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_pthread.c,v 1.6 2001/07/12 19:58:56 shadow Exp $"); #include #include --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_pthread.c,v 1.6.4.1 2001/09/19 22:36:26 shadow Exp $"); #include #include *************** *** 207,218 **** u_long host; u_short port; register struct rx_packet *p = (struct rx_packet *)0; - unsigned long rfds; - register unsigned long rrfds; - struct clock cv; - long nextPollTime; /* time to next poll FD before sleeping */ - int lastPollWorked, doingPoll; /* true iff last poll was useful */ - struct timeval tv, *tvp; assert(pthread_mutex_lock(&listener_mutex)==0); while (!listeners_started) { --- 207,212 ---- *************** *** 378,383 **** --- 372,378 ---- exit(1); } AFS_SIGSET_RESTORE(); + return 0; } *************** *** 415,418 **** --- 410,414 ---- printf("rxi_sendmsg failed, error %d\n", errno); fflush(stdout); } + return 0; } Index: openafs/src/rx/rx_rdwr.c diff -c openafs/src/rx/rx_rdwr.c:1.12 openafs/src/rx/rx_rdwr.c:1.12.2.1 *** openafs/src/rx/rx_rdwr.c:1.12 Tue Aug 7 20:03:57 2001 --- openafs/src/rx/rx_rdwr.c Wed Sep 19 18:25:28 2001 *************** *** 14,24 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_rdwr.c,v 1.12 2001/08/08 00:03:57 shadow Exp $"); #ifdef KERNEL #ifndef UKERNEL ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include "../afs/sysincludes.h" #else #include "../h/types.h" --- 14,24 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/rx/rx_rdwr.c,v 1.12.2.1 2001/09/19 22:25:28 shadow Exp $"); #ifdef KERNEL #ifndef UKERNEL ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include "../afs/sysincludes.h" #else #include "../h/types.h" Index: openafs/src/rx/test/generator.c diff -c openafs/src/rx/test/generator.c:1.5 openafs/src/rx/test/generator.c:1.5.4.1 *** openafs/src/rx/test/generator.c:1.5 Thu Jul 12 15:59:08 2001 --- openafs/src/rx/test/generator.c Wed Sep 19 18:40:38 2001 *************** *** 52,58 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/test/generator.c,v 1.5 2001/07/12 19:59:08 shadow Exp $"); #include #include --- 52,58 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rx/test/generator.c,v 1.5.4.1 2001/09/19 22:40:38 shadow Exp $"); #include #include *************** *** 880,886 **** fprintf(itl_h, "int main (int argc, char *argv[]) {\n" "\tint code;\n\n" ! "\tinitialize_cmd_error_table();\n" "\tSetupRunCmd();\n" "\tcode = cmd_Dispatch(argc, argv);\n\n" "\treturn(code);\n" --- 880,886 ---- fprintf(itl_h, "int main (int argc, char *argv[]) {\n" "\tint code;\n\n" ! "\tinitialize_CMD_error_table();\n" "\tSetupRunCmd();\n" "\tcode = cmd_Dispatch(argc, argv);\n\n" "\treturn(code);\n" *************** *** 1334,1340 **** "int main(int argc, char **argv) {\n" "\tint code;\n" ! "\tinitialize_cmd_error_table();\n" "\tSetupRunCmd();\n" "\tcode = cmd_Dispatch(argc, argv);\n" "\treturn(code);\n" --- 1334,1340 ---- "int main(int argc, char **argv) {\n" "\tint code;\n" ! "\tinitialize_CMD_error_table();\n" "\tSetupRunCmd();\n" "\tcode = cmd_Dispatch(argc, argv);\n" "\treturn(code);\n" Index: openafs/src/rxgen/rpc_main.c diff -c openafs/src/rxgen/rpc_main.c:1.12 openafs/src/rxgen/rpc_main.c:1.12.2.2 *** openafs/src/rxgen/rpc_main.c:1.12 Wed Aug 15 20:48:52 2001 --- openafs/src/rxgen/rpc_main.c Wed Sep 19 18:36:28 2001 *************** *** 36,42 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxgen/rpc_main.c,v 1.12 2001/08/16 00:48:52 shadow Exp $"); #include #include --- 36,42 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxgen/rpc_main.c,v 1.12.2.2 2001/09/19 22:36:28 shadow Exp $"); #include #include *************** *** 95,101 **** static char *cmdname; #ifdef AFS_SUN5_ENV static char CPP[] = "/usr/ccs/lib/cpp"; ! #elif defined(AFS_FBSD_ENV) static char CPP[] = "/usr/bin/cpp"; #elif defined(AFS_NT40_ENV) static char CPP[MAXCMDLINE]; --- 95,101 ---- static char *cmdname; #ifdef AFS_SUN5_ENV static char CPP[] = "/usr/ccs/lib/cpp"; ! #elif defined(AFS_XBSD_ENV) static char CPP[] = "/usr/bin/cpp"; #elif defined(AFS_NT40_ENV) static char CPP[MAXCMDLINE]; *************** *** 334,342 **** char *infile; char *define; { - char *exec_args[MAXCPPARGS+10]; int nargs = 0; - char **args; char cpp_cmdline[MAXCMDLINE]; int i; --- 334,340 ---- Index: openafs/src/rxgen/rpc_parse.c diff -c openafs/src/rxgen/rpc_parse.c:1.10 openafs/src/rxgen/rpc_parse.c:1.10.2.1 *** openafs/src/rxgen/rpc_parse.c:1.10 Tue Aug 7 20:04:05 2001 --- openafs/src/rxgen/rpc_parse.c Wed Sep 19 18:36:28 2001 *************** *** 35,41 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxgen/rpc_parse.c,v 1.10 2001/08/08 00:04:05 shadow Exp $"); #include #include --- 35,41 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxgen/rpc_parse.c,v 1.10.2.1 2001/09/19 22:36:28 shadow Exp $"); #include #include *************** *** 1451,1461 **** definition *defp; int *somefrees; { - proc1_list *plist, *plist1; - list *listp; - definition *defp1; - int preserve_flag = 0; - f_print(fout, "#ifndef KERNEL\n"); f_print(fout, "\tafs_int32 %s%s%s%s();\n", prefix, ServerPrefix, PackagePrefix[PackageIndex], defp->pc.proc_name); --- 1451,1456 ---- Index: openafs/src/rxkad/rxkad_errs.et diff -c openafs/src/rxkad/rxkad_errs.et:1.2 openafs/src/rxkad/rxkad_errs.et:1.2.8.1 *** openafs/src/rxkad/rxkad_errs.et:1.2 Sat Nov 4 05:05:44 2000 --- openafs/src/rxkad/rxkad_errs.et Wed Sep 19 18:40:40 2001 *************** *** 10,16 **** # NOTE: RXKADNOAUTH value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table rxk ec RXKADINCONSISTENCY, "Security module structure inconsistent" ec RXKADPACKETSHORT, "Packet too short for security challenge" ec RXKADLEVELFAIL, "Security level negotiation failed" --- 10,16 ---- # NOTE: RXKADNOAUTH value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table RXK ec RXKADINCONSISTENCY, "Security module structure inconsistent" ec RXKADPACKETSHORT, "Packet too short for security challenge" ec RXKADLEVELFAIL, "Security level negotiation failed" Index: openafs/src/rxkad/rxkad_server.c diff -c openafs/src/rxkad/rxkad_server.c:1.7 openafs/src/rxkad/rxkad_server.c:1.7.2.1 *** openafs/src/rxkad/rxkad_server.c:1.7 Tue Aug 7 20:04:05 2001 --- openafs/src/rxkad/rxkad_server.c Wed Sep 19 18:36:29 2001 *************** *** 14,20 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxkad/rxkad_server.c,v 1.7 2001/08/08 00:04:05 shadow Exp $"); #include #include --- 14,20 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxkad/rxkad_server.c,v 1.7.2.1 2001/09/19 22:36:29 shadow Exp $"); #include #include *************** *** 180,186 **** IN struct rx_packet *apacket; IN struct rx_connection *aconn; { struct rxkad_sconn *sconn; - afs_int32 temp; char *challenge; int challengeSize; struct rxkad_v2Challenge c_v2; /* version 2 */ --- 180,185 ---- Index: openafs/src/rxkad/test/stress.c diff -c openafs/src/rxkad/test/stress.c:1.5 openafs/src/rxkad/test/stress.c:1.5.2.1 *** openafs/src/rxkad/test/stress.c:1.5 Tue Aug 7 20:04:08 2001 --- openafs/src/rxkad/test/stress.c Wed Sep 19 18:40:40 2001 *************** *** 12,18 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxkad/test/stress.c,v 1.5 2001/08/08 00:04:08 shadow Exp $"); #include #include --- 12,18 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/rxkad/test/stress.c,v 1.5.2.1 2001/09/19 22:40:40 shadow Exp $"); #include #include *************** *** 265,273 **** whoami = argv[0]; ! initialize_rxk_error_table(); ! initialize_rks_error_table(); ! initialize_cmd_error_table(); code = rx_Init (0); rx_SetRxDeadTime(120); --- 265,273 ---- whoami = argv[0]; ! initialize_RXK_error_table(); ! initialize_RKS_error_table(); ! initialize_CMD_error_table(); code = rx_Init (0); rx_SetRxDeadTime(120); Index: openafs/src/rxkad/test/stress_errs.et diff -c openafs/src/rxkad/test/stress_errs.et:1.2 openafs/src/rxkad/test/stress_errs.et:1.2.8.1 *** openafs/src/rxkad/test/stress_errs.et:1.2 Sat Nov 4 05:05:46 2000 --- openafs/src/rxkad/test/stress_errs.et Wed Sep 19 18:40:40 2001 *************** *** 5,11 **** # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table rks ec RXKST_PROCESSCREATED, "process created, not yet started" ec RXKST_PROCESSRUNNING, "process running, no error" ec RXKST_BADARGS, "arguments illegal or inconsistent" --- 5,11 ---- # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html ! error_table RKS ec RXKST_PROCESSCREATED, "process created, not yet started" ec RXKST_PROCESSRUNNING, "process running, no error" ec RXKST_BADARGS, "arguments illegal or inconsistent" Index: openafs/src/rxstat/NTMakefile diff -c openafs/src/rxstat/NTMakefile:1.3 openafs/src/rxstat/NTMakefile:1.3.4.1 *** openafs/src/rxstat/NTMakefile:1.3 Mon Apr 30 03:04:40 2001 --- openafs/src/rxstat/NTMakefile Wed Sep 19 18:32:53 2001 *************** *** 35,37 **** --- 35,41 ---- install: $(LIBFILE) $(INCFILES) install9x: install + + clean:: + $(DEL) rxstat.cs.c rxstat.h rxstat.ss.c rxstat.xdr.c + Index: openafs/src/sys/Makefile.in diff -c openafs/src/sys/Makefile.in:1.5 openafs/src/sys/Makefile.in:1.5.2.1 *** openafs/src/sys/Makefile.in:1.5 Sun Sep 9 10:58:55 2001 --- openafs/src/sys/Makefile.in Wed Sep 19 18:25:30 2001 *************** *** 110,116 **** $(RM) -f syscall.ss syscall.i;; \ hp_ux11? ) \ touch syscall.o;; \ ! i386_fbsd* ) \ touch syscall.o;; \ *) \ /lib/cpp ${SFLAGS} syscall.s syscall.ss; \ --- 110,116 ---- $(RM) -f syscall.ss syscall.i;; \ hp_ux11? ) \ touch syscall.o;; \ ! i386_*bsd* ) \ touch syscall.o;; \ *) \ /lib/cpp ${SFLAGS} syscall.s syscall.ss; \ Index: openafs/src/sys/pioctl_nt.c diff -c openafs/src/sys/pioctl_nt.c:1.6 openafs/src/sys/pioctl_nt.c:1.6.4.1 *** openafs/src/sys/pioctl_nt.c:1.6 Thu Jul 12 15:59:17 2001 --- openafs/src/sys/pioctl_nt.c Wed Sep 19 18:36:30 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/sys/pioctl_nt.c,v 1.6 2001/07/12 19:59:17 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/sys/pioctl_nt.c,v 1.6.4.1 2001/09/19 22:36:30 shadow Exp $"); #include #include *************** *** 87,93 **** HKEY parmKey; DWORD dummyLen; long code; - int hostsize; if (fileNamep) { drivep = strchr(fileNamep, ':'); --- 87,92 ---- *************** *** 116,126 **** --- 115,128 ---- #ifndef AFS_WIN95_ENV gethostname(hostName, sizeof(hostName)); #else + { + int hostsize; /* DJGPP version of gethostname gets the NetBIOS name of the machine, so that is what we are using for the AFS server name instead of the DNS name. */ hostsize = sizeof(hostName); GetComputerName(hostName, &hostsize); + } #endif /* AFS_WIN95_ENV */ havehost: Index: openafs/src/tbutc/NTMakefile diff -c openafs/src/tbutc/NTMakefile:1.6 openafs/src/tbutc/NTMakefile:1.6.2.1 *** openafs/src/tbutc/NTMakefile:1.6 Sat Sep 8 00:31:30 2001 --- openafs/src/tbutc/NTMakefile Wed Sep 19 18:32:54 2001 *************** *** 56,67 **** $(DESTDIR)\lib\afs\afskauth.lib \ $(DESTDIR)\lib\afsubik.lib \ $(DESTDIR)\lib\afs\afsauth.lib \ - \ $(DESTDIR)\lib\afsrpc.lib \ $(DESTDIR)\lib\afsrxkad.lib \ $(DESTDIR)\lib\afsrx.lib \ $(DESTDIR)\lib\afslwp.lib \ - \ $(DESTDIR)\lib\afs\afsutil.lib \ $(DESTDIR)\lib\afs\afsusd.lib \ $(DESTDIR)\lib\afs\afspioctl.lib \ --- 56,65 ---- *************** *** 76,81 **** --- 74,80 ---- $(DESTDIR)\lib\pthread.lib \ !ENDIF $(DESTDIR)\lib\afsdes.lib + # $(DESTDIR)\lib\afsauthent.lib \ # $(DESTDIR)\lib\afsrpc.lib \ Index: openafs/src/ubik/Makefile.in diff -c openafs/src/ubik/Makefile.in:1.4 openafs/src/ubik/Makefile.in:1.4.2.1 *** openafs/src/ubik/Makefile.in:1.4 Fri Sep 7 19:36:02 2001 --- openafs/src/ubik/Makefile.in Wed Sep 19 18:25:31 2001 *************** *** 44,50 **** RXGEN=${TOP_SRCDIR}/rxgen/rxgen COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et ! all: test ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) --- 44,50 ---- RXGEN=${TOP_SRCDIR}/rxgen/rxgen COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et ! all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS) Index: openafs/src/ubik/NTMakefile diff -c openafs/src/ubik/NTMakefile:1.3 openafs/src/ubik/NTMakefile:1.3.4.1 *** openafs/src/ubik/NTMakefile:1.3 Mon Apr 30 03:05:07 2001 --- openafs/src/ubik/NTMakefile Wed Sep 19 18:32:55 2001 *************** *** 105,110 **** --- 105,111 ---- clean:: $(DEL) ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c $(DEL) $(INCFILEDIR)\ubik_int.h uerrors.c $(INCFILEDIR)\ubik.h + $(DEL) ubik_int.h ubik.h ############################################################################ # test ubik Index: openafs/src/ubik/beacon.c diff -c openafs/src/ubik/beacon.c:1.9 openafs/src/ubik/beacon.c:1.9.2.1 *** openafs/src/ubik/beacon.c:1.9 Tue Aug 7 20:04:12 2001 --- openafs/src/ubik/beacon.c Wed Sep 19 18:36:30 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/beacon.c,v 1.9 2001/08/08 00:04:12 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/beacon.c,v 1.9.2.1 2001/09/19 22:36:30 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 447,453 **** afs_uint32 aservers[]; /* list of all possible server addresses */ { afs_uint32 myAddr[UBIK_MAX_INTERFACE_ADDR], *servList, tmpAddr; ! int count, index, found, i, j, totalServers, start, end; if (info) totalServers = info->numServers; --- 447,453 ---- afs_uint32 aservers[]; /* list of all possible server addresses */ { afs_uint32 myAddr[UBIK_MAX_INTERFACE_ADDR], *servList, tmpAddr; ! int count, found, i, j, totalServers, start, end; if (info) totalServers = info->numServers; *************** *** 574,580 **** updateUbikNetworkAddress(ubik_host) afs_uint32 ubik_host[UBIK_MAX_INTERFACE_ADDR]; { ! int j, count, found, index, code = 0; UbikInterfaceAddr inAddr, outAddr; struct rx_connection *conns[MAXSERVERS]; struct ubik_server *ts, *server[MAXSERVERS]; --- 574,580 ---- updateUbikNetworkAddress(ubik_host) afs_uint32 ubik_host[UBIK_MAX_INTERFACE_ADDR]; { ! int j, count, code = 0; UbikInterfaceAddr inAddr, outAddr; struct rx_connection *conns[MAXSERVERS]; struct ubik_server *ts, *server[MAXSERVERS]; Index: openafs/src/ubik/disk.c diff -c openafs/src/ubik/disk.c:1.5 openafs/src/ubik/disk.c:1.5.2.1 *** openafs/src/ubik/disk.c:1.5 Tue Aug 7 20:04:12 2001 --- openafs/src/ubik/disk.c Wed Sep 19 18:36:31 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/disk.c,v 1.5 2001/08/08 00:04:12 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/disk.c,v 1.5.2.1 2001/09/19 22:36:31 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 236,246 **** } /* Take a buffer and mark it as the least recently used buffer */ ! static int Dlru(abuf) struct buffer *abuf; { if (LruBuffer == abuf) ! return 0; /* Unthread from where it is in the list */ abuf->lru_next->lru_prev = abuf->lru_prev; --- 236,246 ---- } /* Take a buffer and mark it as the least recently used buffer */ ! static void Dlru(abuf) struct buffer *abuf; { if (LruBuffer == abuf) ! return; /* Unthread from where it is in the list */ abuf->lru_next->lru_prev = abuf->lru_prev; *************** *** 256,267 **** } /* Take a buffer and mark it as the most recently used buffer */ ! static int Dmru(abuf) struct buffer *abuf; { if (LruBuffer == abuf) { LruBuffer = LruBuffer->lru_next; ! return 0; } /* Unthread from where it is in the list */ --- 256,267 ---- } /* Take a buffer and mark it as the most recently used buffer */ ! static void Dmru(abuf) struct buffer *abuf; { if (LruBuffer == abuf) { LruBuffer = LruBuffer->lru_next; ! return; } /* Unthread from where it is in the list */ *************** *** 273,279 **** abuf->lru_prev = LruBuffer->lru_prev; LruBuffer->lru_prev->lru_next = abuf; LruBuffer->lru_prev = abuf; - } /* get a pointer to a particular buffer */ --- 273,278 ---- *************** *** 283,289 **** int page; { /* Read a page from the disk. */ struct buffer *tb, *lastbuffer; ! afs_int32 trys, code; calls++; lastbuffer = LruBuffer->lru_prev; --- 282,288 ---- int page; { /* Read a page from the disk. */ struct buffer *tb, *lastbuffer; ! afs_int32 code; calls++; lastbuffer = LruBuffer->lru_prev; *************** *** 469,475 **** } /* Release a buffer, specifying whether or not the buffer has been modified by the locker. */ ! static DRelease (ap,flag) char *ap; int flag; { int index; --- 468,474 ---- } /* Release a buffer, specifying whether or not the buffer has been modified by the locker. */ ! static void DRelease (ap,flag) char *ap; int flag; { int index; *************** *** 480,486 **** bp = &(Buffers[index]); bp->lockers--; if (flag) bp->dirty=1; ! return 0; } /* flush all modified buffers, leaves dirty bits set (they're cleared --- 479,485 ---- bp = &(Buffers[index]); bp->lockers--; if (flag) bp->dirty=1; ! return; } /* flush all modified buffers, leaves dirty bits set (they're cleared Index: openafs/src/ubik/lock.c diff -c openafs/src/ubik/lock.c:1.5 openafs/src/ubik/lock.c:1.5.4.1 *** openafs/src/ubik/lock.c:1.5 Thu Jul 12 15:59:18 2001 --- openafs/src/ubik/lock.c Wed Sep 19 18:36:31 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/lock.c,v 1.5 2001/07/12 19:59:18 shadow Exp $"); #include #ifndef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/lock.c,v 1.5.4.1 2001/09/19 22:36:31 shadow Exp $"); #include #ifndef AFS_NT40_ENV *************** *** 62,68 **** struct ubik_trans *atrans; int atype, await; { - struct ubik_trans *tt; struct ubik_dbase *dbase=atrans->dbase; /* On first pass, initialize the lock */ --- 62,67 ---- *************** *** 118,123 **** --- 117,123 ---- } /* Release the transaction lock */ + int ulock_relLock(atrans) struct ubik_trans *atrans; { Index: openafs/src/ubik/remote.c diff -c openafs/src/ubik/remote.c:1.6 openafs/src/ubik/remote.c:1.6.2.1 *** openafs/src/ubik/remote.c:1.6 Tue Aug 7 20:04:12 2001 --- openafs/src/ubik/remote.c Wed Sep 19 18:36:31 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/remote.c,v 1.6 2001/08/08 00:04:12 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/remote.c,v 1.6.2.1 2001/09/19 22:36:31 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 28,33 **** --- 28,34 ---- #include "ubik_int.h" int (*ubik_CheckRXSecurityProc)(); char *ubik_CheckRXSecurityRock; + void printServerInfo(); /* routines for handling requests remotely-submitted by the sync site. These are only write transactions (we don't propagate read trans), and there is at most one *************** *** 453,459 **** register afs_int32 code; register struct ubik_dbase *dbase; char tbuffer[256]; ! afs_int32 offset, t; struct ubik_version tversion; register int tlen; struct rx_peer *tpeer; --- 454,460 ---- register afs_int32 code; register struct ubik_dbase *dbase; char tbuffer[256]; ! afs_int32 offset; struct ubik_version tversion; register int tlen; struct rx_peer *tpeer; *************** *** 614,619 **** --- 615,621 ---- return 0; } + void printServerInfo() { struct ubik_server *ts; Index: openafs/src/ubik/ubik.c diff -c openafs/src/ubik/ubik.c:1.7 openafs/src/ubik/ubik.c:1.7.2.1 *** openafs/src/ubik/ubik.c:1.7 Tue Aug 7 20:04:12 2001 --- openafs/src/ubik/ubik.c Wed Sep 19 18:40:42 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/ubik.c,v 1.7 2001/08/08 00:04:12 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/ubik.c,v 1.7.2.1 2001/09/19 22:40:42 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 216,222 **** extern void rx_ServerProc(); extern int rx_stackSize; ! initialize_u_error_table(); tdb = (struct ubik_dbase *) malloc(sizeof(struct ubik_dbase)); tdb->pathName = (char *) malloc(strlen(pathName)+1); --- 216,222 ---- extern void rx_ServerProc(); extern int rx_stackSize; ! initialize_U_error_table(); tdb = (struct ubik_dbase *) malloc(sizeof(struct ubik_dbase)); tdb->pathName = (char *) malloc(strlen(pathName)+1); Index: openafs/src/ubik/ubikclient.c diff -c openafs/src/ubik/ubikclient.c:1.5 openafs/src/ubik/ubikclient.c:1.5.4.1 *** openafs/src/ubik/ubikclient.c:1.5 Thu Jul 12 15:59:18 2001 --- openafs/src/ubik/ubikclient.c Wed Sep 19 18:40:42 2001 *************** *** 14,20 **** #include #endif ! RCSID("$Header: /data/cvs/openafs/src/ubik/ubikclient.c,v 1.5 2001/07/12 19:59:18 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" --- 14,20 ---- #include #endif ! RCSID("$Header: /data/cvs/openafs/src/ubik/ubikclient.c,v 1.5.4.1 2001/09/19 22:40:42 shadow Exp $"); #if defined(UKERNEL) #include "../afs/sysincludes.h" *************** *** 200,206 **** int offset; register struct ubik_client *tc; ! initialize_u_error_table(); if ( *aclient ) { /* the application is doing a re-initialization*/ LOCK_UBIK_CLIENT((*aclient)) --- 200,206 ---- int offset; register struct ubik_client *tc; ! initialize_U_error_table(); if ( *aclient ) { /* the application is doing a re-initialization*/ LOCK_UBIK_CLIENT((*aclient)) Index: openafs/src/ubik/uerrors.et diff -c openafs/src/ubik/uerrors.et:1.2 openafs/src/ubik/uerrors.et:1.2.8.1 *** openafs/src/ubik/uerrors.et:1.2 Sat Nov 4 05:05:54 2000 --- openafs/src/ubik/uerrors.et Wed Sep 19 18:40:42 2001 *************** *** 9,15 **** # Ubik error table ! error_table u ec UNOQUORUM, "no quorum elected" ec UNOTSYNC, "not synchronization site (should work on sync site)" ec UNHOSTS, "too many hosts" --- 9,15 ---- # Ubik error table ! error_table U ec UNOQUORUM, "no quorum elected" ec UNOTSYNC, "not synchronization site (should work on sync site)" ec UNHOSTS, "too many hosts" Index: openafs/src/ubik/vote.c diff -c openafs/src/ubik/vote.c:1.7 openafs/src/ubik/vote.c:1.7.2.2 *** openafs/src/ubik/vote.c:1.7 Tue Aug 7 20:04:12 2001 --- openafs/src/ubik/vote.c Wed Sep 19 23:58:52 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/vote.c,v 1.7 2001/08/08 00:04:12 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/ubik/vote.c,v 1.7.2.2 2001/09/20 03:58:52 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 126,132 **** now = FT_ApproxTime(); if (BIGTIME + ubik_lastYesTime < now) return 1; /* no valid guy even trying */ ! if (lastYesState && lastYerHost != ubik_host[0]) return 0; /* other guy is sync site, leave him alone */ if (ntohl((afs_uint32) lastYesHost) < ntohl((afs_uint32) ubik_host[0])) return 0; /* if someone is valid and better than us, don't run */ /* otherwise we should run */ --- 126,132 ---- now = FT_ApproxTime(); if (BIGTIME + ubik_lastYesTime < now) return 1; /* no valid guy even trying */ ! if (lastYesState && lastYesHost != ubik_host[0]) return 0; /* other guy is sync site, leave him alone */ if (ntohl((afs_uint32) lastYesHost) < ntohl((afs_uint32) ubik_host[0])) return 0; /* if someone is valid and better than us, don't run */ /* otherwise we should run */ *************** *** 430,436 **** afs_int32 awhich; register struct ubik_sdebug_old *aparm; { register struct ubik_server *ts; ! register int i; for(ts=ubik_servers; ts; ts=ts->next) { if (awhich-- == 0) { /* we're done */ --- 430,436 ---- afs_int32 awhich; register struct ubik_sdebug_old *aparm; { register struct ubik_server *ts; ! for(ts=ubik_servers; ts; ts=ts->next) { if (awhich-- == 0) { /* we're done */ *************** *** 453,459 **** SVOTE_DebugOld(rxcall, aparm) struct rx_call *rxcall; register struct ubik_debug_old *aparm; { ! int i; /* fill in the basic debug structure. Note the the RPC protocol transfers, * integers in host order. */ --- 453,459 ---- SVOTE_DebugOld(rxcall, aparm) struct rx_call *rxcall; register struct ubik_debug_old *aparm; { ! /* fill in the basic debug structure. Note the the RPC protocol transfers, * integers in host order. */ Index: openafs/src/update/NTMakefile diff -c openafs/src/update/NTMakefile:1.2 openafs/src/update/NTMakefile:1.2.8.1 *** openafs/src/update/NTMakefile:1.2 Sat Nov 4 05:05:55 2000 --- openafs/src/update/NTMakefile Wed Sep 19 18:32:56 2001 *************** *** 77,79 **** --- 77,80 ---- # Local clean target; augments predefined clean target clean:: + $(DEL) update.cs.c update.ss.c update.xdr.c update.h Index: openafs/src/usd/usd_file.c diff -c openafs/src/usd/usd_file.c:1.7 openafs/src/usd/usd_file.c:1.7.2.1 *** openafs/src/usd/usd_file.c:1.7 Tue Aug 7 20:04:14 2001 --- openafs/src/usd/usd_file.c Wed Sep 19 18:25:32 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/usd/usd_file.c,v 1.7 2001/08/08 00:04:14 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/usd/usd_file.c,v 1.7.2.1 2001/09/19 22:25:32 shadow Exp $"); #include #include *************** *** 26,32 **** #endif #include #endif /* AFS_AIX_ENV */ ! #ifdef AFS_DUX40_ENV #include #endif #include --- 26,32 ---- #endif #include #endif /* AFS_AIX_ENV */ ! #if defined(AFS_DUX40_ENV) || defined(AFS_OBSD_ENV) #include #endif #include Index: openafs/src/uss/uss.c diff -c openafs/src/uss/uss.c:1.4 openafs/src/uss/uss.c:1.4.4.1 *** openafs/src/uss/uss.c:1.4 Thu Jul 12 15:59:23 2001 --- openafs/src/uss/uss.c Wed Sep 19 18:40:43 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/uss/uss.c,v 1.4 2001/07/12 19:59:23 shadow Exp $"); #ifdef AFS_AIX32_ENV #include --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/uss/uss.c,v 1.4.4.1 2001/09/19 22:40:43 shadow Exp $"); #ifdef AFS_AIX32_ENV #include *************** *** 1782,1795 **** * In order to get error code -> error message translations to work, * we have to initialize all error tables. */ ! initialize_cmd_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_ka_error_table(); ! initialize_acfg_error_table(); ! initialize_vl_error_table(); ! initialize_pt_error_table(); ! initialize_u_error_table(); } /*InitETTables*/ --- 1782,1795 ---- * In order to get error code -> error message translations to work, * we have to initialize all error tables. */ ! initialize_CMD_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_KA_error_table(); ! initialize_ACFG_error_table(); ! initialize_VL_error_table(); ! initialize_PT_error_table(); ! initialize_U_error_table(); } /*InitETTables*/ Index: openafs/src/util/dirpath.c diff -c openafs/src/util/dirpath.c:1.10 openafs/src/util/dirpath.c:1.10.2.1 *** openafs/src/util/dirpath.c:1.10 Sat Sep 8 00:31:32 2001 --- openafs/src/util/dirpath.c Thu Sep 20 16:12:36 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/util/dirpath.c,v 1.10 2001/09/08 04:31:32 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/util/dirpath.c,v 1.10.2.1 2001/09/20 20:12:36 shadow Exp $"); #include #include *************** *** 222,227 **** --- 222,232 ---- strcpy(dirPathArray[AFSDIR_CLIENT_VICE_DIRPATH_ID], afsClntDirPath); pathp = dirPathArray[AFSDIR_CLIENT_ETC_DIRPATH_ID]; + #ifdef AFS_DARWIN_ENV + if (access(AFSDIR_ALTERNATE_CLIENT_ETC_DIR, F_OK) == 0) + AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_ALTERNATE_CLIENT_ETC_DIR); + else + #endif AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_CLIENT_ETC_DIR); #endif /* AFS_NT40_ENV */ Index: openafs/src/util/dirpath.hin diff -c openafs/src/util/dirpath.hin:1.2 openafs/src/util/dirpath.hin:1.2.2.1 *** openafs/src/util/dirpath.hin:1.2 Fri Sep 7 19:36:06 2001 --- openafs/src/util/dirpath.hin Thu Sep 20 16:12:36 2001 *************** *** 173,178 **** --- 173,179 ---- #define AFSDIR_CANONICAL_CLIENT_VICE_DIRPATH "/usr/vice" #ifdef AFS_DARWIN_ENV #define AFSDIR_ALTERNATE_CLIENT_VICE_DIRPATH "/var/db/openafs" + #define AFSDIR_ALTERNATE_CLIENT_ETC_DIR "/var/db/openafs/etc" #endif #define AFSDIR_CANONICAL_SERVER_BIN_DIRPATH \ Index: openafs/src/vfsck/setup.c diff -c openafs/src/vfsck/setup.c:1.4 openafs/src/vfsck/setup.c:1.4.2.2 *** openafs/src/vfsck/setup.c:1.4 Tue Aug 7 20:04:20 2001 --- openafs/src/vfsck/setup.c Fri Sep 21 19:49:39 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vfsck/setup.c,v 1.4 2001/08/08 00:04:20 shadow Exp $"); #include #define VICE --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vfsck/setup.c,v 1.4.2.2 2001/09/21 23:49:39 shadow Exp $"); #include #define VICE *************** *** 199,205 **** dev = sname; } #endif - #ifdef AFS_HPUX_ENV hotroot = is_hotroot(dev); /* --- 199,204 ---- *************** *** 226,234 **** mounted = swap = 0; if (!hotroot) { mounted = is_mounted(dev,&st_mounted); swap = is_swap(st_mounted.st_rdev); } ! if (!fflag && !mflag) { if (hotroot) { msgprintf("fsck: %s: root file system",dev); if (preen) --- 225,239 ---- mounted = swap = 0; if (!hotroot) { mounted = is_mounted(dev,&st_mounted); + #ifdef AFS_HPUX_ENV swap = is_swap(st_mounted.st_rdev); + #endif } ! if (!fflag ! #ifdef AFS_HPUX_ENV ! && !mflag ! #endif ! ) { if (hotroot) { msgprintf("fsck: %s: root file system",dev); if (preen) *************** *** 256,262 **** } } } - #endif if (rootdev == statb.st_rdev) hotroot++; if ((fsreadfd = open(dev, O_RDONLY)) < 0) { --- 261,266 ---- *************** *** 787,795 **** } #endif - #ifdef AFS_HPUX_ENV #include #include #include extern int errno; --- 791,800 ---- } #endif #include + #ifdef AFS_HPUX_ENV #include + #endif #include extern int errno; *************** *** 826,831 **** --- 831,838 ---- return (0); } + #ifdef AFS_HPUX_ENV + #define PS_BURST 1 #ifdef AFS_HPUX102_ENV #define PSTAT(P, N, I) pstat_getswap(P, sizeof(*P), (size_t)N, I) *************** *** 849,854 **** --- 856,864 ---- return (match); } + #endif AFS_HPUX_ENV + + is_pre_init(rdevnum) dev_t rdevnum; { *************** *** 859,866 **** --- 869,885 ---- is_roroot() { + #ifndef UID_NO_CHANGE + struct stat stslash; + + if (stat("/",&stslash) < 0) + return (0); + if ( chown("/", stslash.st_uid, stslash.st_gid) == 0 ) + return(0); + #else if ( chown("/",UID_NO_CHANGE,GID_NO_CHANGE) == 0 ) return(0); + #endif else if (errno != EROFS ) { printf ("fsck: chown failed: %d\n",errno); return (0); *************** *** 954,960 **** return (0); } - #endif #if defined(AFS_HPUX110_ENV) /* --- 973,978 ---- Index: openafs/src/viced/afsfileprocs.c diff -c openafs/src/viced/afsfileprocs.c:1.10 openafs/src/viced/afsfileprocs.c:1.10.2.1 *** openafs/src/viced/afsfileprocs.c:1.10 Tue Aug 7 20:04:21 2001 --- openafs/src/viced/afsfileprocs.c Wed Sep 19 18:25:33 2001 *************** *** 28,34 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/viced/afsfileprocs.c,v 1.10 2001/08/08 00:04:21 shadow Exp $"); #include #include --- 28,34 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/viced/afsfileprocs.c,v 1.10.2.1 2001/09/19 22:25:33 shadow Exp $"); #include #include *************** *** 78,84 **** #include #include #include ! #if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #include #endif #if !defined(AFS_NT40_ENV) --- 78,84 ---- #include #include #include ! #if ! defined(AFS_SGI_ENV) && ! defined(AFS_AIX32_ENV) && ! defined(AFS_NT40_ENV) && ! defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #if !defined(AFS_NT40_ENV) *************** *** 89,95 **** #include #include #else ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif --- 89,95 ---- #include #include #else ! #if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif Index: openafs/src/vlserver/vl_errors.et diff -c openafs/src/vlserver/vl_errors.et:1.2 openafs/src/vlserver/vl_errors.et:1.2.8.1 *** openafs/src/vlserver/vl_errors.et:1.2 Sat Nov 4 05:06:19 2000 --- openafs/src/vlserver/vl_errors.et Wed Sep 19 18:40:44 2001 *************** *** 10,16 **** # NOTE: VL_PERM value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table vl ec VL_IDEXIST, "Volume Id entry exists in vl database" ec VL_IO, "I/O related error" ec VL_NAMEEXIST, "Volume name entry exists in vl database" --- 10,16 ---- # NOTE: VL_PERM value is hardcoded in audit/audit.h, so if you make # changes here, make sure that audit/audit.h is kept up to date. ! error_table VL ec VL_IDEXIST, "Volume Id entry exists in vl database" ec VL_IO, "I/O related error" ec VL_NAMEEXIST, "Volume name entry exists in vl database" Index: openafs/src/vlserver/vlclient.c diff -c openafs/src/vlserver/vlclient.c:1.7 openafs/src/vlserver/vlclient.c:1.7.2.1 *** openafs/src/vlserver/vlclient.c:1.7 Tue Aug 7 20:04:22 2001 --- openafs/src/vlserver/vlclient.c Wed Sep 19 18:36:31 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlclient.c,v 1.7 2001/08/08 00:04:22 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlclient.c,v 1.7.2.1 2001/09/19 22:36:31 shadow Exp $"); #include #include *************** *** 51,56 **** --- 51,66 ---- #include "vlserver.h" #include "vlclient.h" + void fill_listattributes_entry(); + void display_listattributes_entry(); + void display_entry(); + void display_entryN(); + void display_update_entry(); + void dump_stats(); + void GetArgs(); + void print_usage(); + void fill_entry(); + void fill_update_entry(); extern int VL_GetAddrsU(), VL_RegisterAddrs(); #define VL_NUMBER_OPCODESX 34 *************** *** 253,259 **** { register struct cmd_item *ti; register afs_int32 code, server = 0, sawserver=0; ! afs_int32 i, id, voltype; struct vldbentry entry; char *cmd = 0, *cellp=0; struct VldbUpdateEntry updateentry; --- 263,269 ---- { register struct cmd_item *ti; register afs_int32 code, server = 0, sawserver=0; ! afs_int32 id, voltype; struct vldbentry entry; char *cmd = 0, *cellp=0; struct VldbUpdateEntry updateentry; *************** *** 395,401 **** } else if (!strcmp(oper,"checkhash")) { int index, count, num=0, num1=0, num2 = 0, num3=0, num31=0, num4=0, num41=0, next_index; struct vldbentry tentry; - struct Vlent *vl1; VL = SVL = (struct Vlent *) malloc(ALLOCNT * sizeof(struct Vlent)); if (VL == NULL) { --- 405,410 ---- *************** *** 448,454 **** } else if (!strcmp(oper,"fixhash")) { int index, count, num=0, num1=0, num2 = 0, next_index, x=0; struct vldbentry tentry; - struct Vlent *vl1; VL = SVL = (struct Vlent *) malloc(ALLOCNT * sizeof(struct Vlent)); if (VL == NULL) { --- 457,462 ---- *************** *** 700,706 **** int nentries, i; afs_uint32 *addrp; bulkaddrs addrs; - struct vldbentry *entry; struct VLCallBack vlcb; addrs.bulkaddrs_val = 0; --- 708,713 ---- *************** *** 775,781 **** int nentries1, nentries2, i, j, x, y, unique, found; afs_uint32 *addrp1, *addrp2; bulkaddrs addrs1, addrs2; - struct vldbentry *entry; struct VLCallBack vlcb; ListAddrByAttributes attrs; afsUUID uuid; --- 782,787 ---- *************** *** 870,876 **** int i; afs_uint32 *addrp, tad; bulkaddrs addrs; - struct vldbentry *entry; afsUUID uuid; memset(&uuid, 0, sizeof(uuid)); --- 876,881 ---- *************** *** 899,905 **** extern struct hostent *hostutil_GetHostByName(); struct hostent *h1, *h2; afs_uint32 a1, a2; - unsigned char n1[80], n2[80]; printf("changing %s", *argp); h1 = hostutil_GetHostByName(&(*argp)[0]); --- 904,909 ---- *************** *** 926,932 **** } } else if (!strcmp(oper,"caid")) { afs_uint32 a1, a2; - unsigned char n1[80], n2[80]; sscanf(&(*argp)[0], "%d", &a1); printf("changing %d (0x%x)", a1, a1); --- 930,935 ---- *************** *** 972,977 **** --- 975,981 ---- } + void fill_entry(entry, argp, nargs) struct vldbentry *entry; char **argp; *************** *** 1008,1014 **** sscanf(&(*argp)[0], "%d", &entry->cloneId); } ! fill_update_entry(entry, argp, nargs) struct VldbUpdateEntry *entry; char **argp; --- 1012,1018 ---- sscanf(&(*argp)[0], "%d", &entry->cloneId); } ! void fill_update_entry(entry, argp, nargs) struct VldbUpdateEntry *entry; char **argp; *************** *** 1075,1082 **** } } } - fill_listattributes_entry(entry, argp, nargs) struct VldbListByAttributes *entry; char **argp; --- 1079,1086 ---- } } } + void fill_listattributes_entry(entry, argp, nargs) struct VldbListByAttributes *entry; char **argp; *************** *** 1109,1114 **** --- 1113,1119 ---- entry->Mask |= VLLIST_FLAG; } + void display_listattributes_entry(entry, error) struct VldbListByAttributes *entry; int error; *************** *** 1130,1135 **** --- 1135,1141 ---- #define volumetype_string(type) (type == RWVOL? "read/write":type == ROVOL? "readonly":type == BACKVOL? "backup":"unknown") + void display_entry(entry, error) struct vldbentry *entry; int error; *************** *** 1145,1150 **** --- 1151,1157 ---- printf("%12u\t%10d\t%10x\n", entry->serverNumber[i], entry->serverPartition[i], entry->serverFlags[i]); } + void display_entryN(entry, error) struct nvldbentry *entry; int error; *************** *** 1171,1178 **** printf("\n"); } } - display_update_entry(entry, error) struct VldbUpdateEntry *entry; int error; --- 1178,1185 ---- printf("\n"); } } + void display_update_entry(entry, error) struct VldbUpdateEntry *entry; int error; *************** *** 1212,1217 **** --- 1219,1225 ---- } } + void dump_stats(stats, vital_header) vldstats *stats; vital_vlheader *vital_header; *************** *** 1230,1235 **** --- 1238,1244 ---- printf("total %s entries=%d\n", volumetype_string(i), ntohl(vital_header->totalEntries[i])); } + void GetArgs(line,args, nargs) register char *line; register char **args; *************** *** 1250,1255 **** --- 1259,1265 ---- } } + void print_usage() { printf("Valid Commands:\n"); Index: openafs/src/vlserver/vldb_check.c diff -c openafs/src/vlserver/vldb_check.c:1.5 openafs/src/vlserver/vldb_check.c:1.5.2.1 *** openafs/src/vlserver/vldb_check.c:1.5 Tue Aug 7 20:04:22 2001 --- openafs/src/vlserver/vldb_check.c Wed Sep 19 18:36:31 2001 *************** *** 24,30 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vldb_check.c,v 1.5 2001/08/08 00:04:22 shadow Exp $"); #include #include --- 24,30 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vldb_check.c,v 1.5.2.1 2001/09/19 22:36:31 shadow Exp $"); #include #include *************** *** 135,141 **** char *volname; { unsigned int hash; - int i; char *vchar; hash = 0; --- 135,140 ---- *************** *** 155,161 **** char *volname; { char *map; ! int slen; map = LEGALCHARS; slen = strlen(volname); --- 154,160 ---- char *volname; { char *map; ! size_t slen; map = LEGALCHARS; slen = strlen(volname); *************** *** 310,315 **** --- 309,315 ---- } } + void readSIT(base, addr) int base; int addr; *************** *** 366,371 **** --- 366,372 ---- * Record what type of entry it is and its address in the record array. * Remember what the maximum volume id we found is and check against the header. */ + void ReadAllEntries(header) struct vlheader *header; { *************** *** 572,581 **** FollowFreeChain(header) struct vlheader *header; { ! int count=0; struct nvlentry vlentry; afs_uint32 addr; ! afs_int32 i, type, rindex; /* Now follow the Free Chain */ if (verbose) --- 573,582 ---- FollowFreeChain(header) struct vlheader *header; { ! afs_int32 count=0; struct nvlentry vlentry; afs_uint32 addr; ! afs_int32 type, rindex; /* Now follow the Free Chain */ if (verbose) *************** *** 584,590 **** readentry(addr, &vlentry, &type); if (type != FR) { printf("Free Chain %d: Bad entry at %u: Not a valid free vlentry (0x%x)\n", ! i, addr, type); continue; } --- 585,591 ---- readentry(addr, &vlentry, &type); if (type != FR) { printf("Free Chain %d: Bad entry at %u: Not a valid free vlentry (0x%x)\n", ! count, addr, type); continue; } *************** *** 625,632 **** struct vlheader *header; { int mhblocks=0; - struct nvlentry vlentry; - afs_uint32 addr; afs_int32 i, j, m, rindex; afs_int32 mhentries, regentries; afs_int32 caddrs[VL_MAX_ADDREXTBLKS]; --- 626,631 ---- *************** *** 676,682 **** record[rindex].addr, caddrs[i], rindex); } if (record[rindex].type & FRC) { ! printf("MH Blocks Chain %d: Bad entry at %u: Already a MH block\n", i, addr); break; } record[rindex].type |= MHC; --- 675,681 ---- record[rindex].addr, caddrs[i], rindex); } if (record[rindex].type & FRC) { ! printf("MH Blocks Chain %d: Bad entry at %u: Already a MH block\n", i, record[rindex].addr); break; } record[rindex].type |= MHC; *************** *** 794,799 **** --- 793,799 ---- } + int WorkerBee(as, arock) struct cmd_syndesc *as; char *arock; *************** *** 921,927 **** char **argv; { struct cmd_syndesc *ts; - struct cmd_item *ti; setlinebuf(stdout); --- 921,926 ---- Index: openafs/src/vlserver/vlprocs.c diff -c openafs/src/vlserver/vlprocs.c:1.5 openafs/src/vlserver/vlprocs.c:1.5.2.1 *** openafs/src/vlserver/vlprocs.c:1.5 Tue Aug 7 20:04:22 2001 --- openafs/src/vlserver/vlprocs.c Wed Sep 19 18:36:31 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlprocs.c,v 1.5 2001/08/08 00:04:22 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlprocs.c,v 1.5.2.1 2001/09/19 22:36:31 shadow Exp $"); #include #include *************** *** 298,305 **** struct rx_call *rxcall; afs_int32 ip1, ip2; { struct ubik_trans *trans; ! afs_int32 errorcode, blockindex; ! struct nvlentry tentry; COUNT_REQ (VLCHANGEADDR); if (!afsconf_SuperUser(vldb_confdir, rxcall, (char *)0)) { --- 298,304 ---- struct rx_call *rxcall; afs_int32 ip1, ip2; { struct ubik_trans *trans; ! afs_int32 errorcode; COUNT_REQ (VLCHANGEADDR); if (!afsconf_SuperUser(vldb_confdir, rxcall, (char *)0)) { *************** *** 1040,1047 **** VldbentryLast = VldbentryFirst + allocCount; /* Handle the attribute by volume id totally separate of the rest (thus additional Mask values are ignored if VLLIST_VOLUMEID is set!) */ if (attributes->Mask & VLLIST_VOLUMEID) { ! afs_int32 blockindex, chain; ! struct nvlentry tempentry; blockindex = FindByID(trans, attributes->volumeid, -1, &tentry, &errorcode); if (blockindex == 0) { --- 1039,1045 ---- VldbentryLast = VldbentryFirst + allocCount; /* Handle the attribute by volume id totally separate of the rest (thus additional Mask values are ignored if VLLIST_VOLUMEID is set!) */ if (attributes->Mask & VLLIST_VOLUMEID) { ! afs_int32 blockindex; blockindex = FindByID(trans, attributes->volumeid, -1, &tentry, &errorcode); if (blockindex == 0) { *************** *** 1148,1155 **** VldbentryLast = VldbentryFirst + allocCount; /* Handle the attribute by volume id totally separate of the rest (thus additional Mask values are ignored if VLLIST_VOLUMEID is set!) */ if (attributes->Mask & VLLIST_VOLUMEID) { ! afs_int32 blockindex, chain; ! struct nvlentry tempentry; blockindex = FindByID(trans, attributes->volumeid, -1, &tentry, &errorcode); if (blockindex == 0) { --- 1146,1152 ---- VldbentryLast = VldbentryFirst + allocCount; /* Handle the attribute by volume id totally separate of the rest (thus additional Mask values are ignored if VLLIST_VOLUMEID is set!) */ if (attributes->Mask & VLLIST_VOLUMEID) { ! afs_int32 blockindex; blockindex = FindByID(trans, attributes->volumeid, -1, &tentry, &errorcode); if (blockindex == 0) { *************** *** 1247,1253 **** int errorcode=0, maxCount=VLDBALLOCCOUNT; struct ubik_trans *trans; struct nvlentry tentry; ! struct nvldbentry *Vldbentry=0, *VldbentryFirst=0, *VldbentryLast=0, tVldbentry; afs_int32 blockindex=0, count=0, k, match, matchindex; int serverindex=-1; /* no server found */ int findserver=0, findpartition=0, findflag=0, findname=0; --- 1244,1250 ---- int errorcode=0, maxCount=VLDBALLOCCOUNT; struct ubik_trans *trans; struct nvlentry tentry; ! struct nvldbentry *Vldbentry=0, *VldbentryFirst=0, *VldbentryLast=0; afs_int32 blockindex=0, count=0, k, match, matchindex; int serverindex=-1; /* no server found */ int findserver=0, findpartition=0, findflag=0, findname=0; *************** *** 1760,1770 **** { afs_int32 code; struct ubik_trans *trans; ! int cnt, h, i, j, k, m, hostslot, base, index; struct extentaddr *exp = 0, *tex; afsUUID tuuid; afs_uint32 addrs[VL_MAXIPADDRS_PERMH]; ! afs_int32 fbase, findex; int count, willChangeEntry, foundUuidEntry, willReplaceCnt; int WillReplaceEntry, WillChange[MAXSERVERID+1], FoundUuid, ReplaceEntry; int srvidx, mhidx; --- 1757,1767 ---- { afs_int32 code; struct ubik_trans *trans; ! int cnt, h, i, j, k, m, base, index; struct extentaddr *exp = 0, *tex; afsUUID tuuid; afs_uint32 addrs[VL_MAXIPADDRS_PERMH]; ! afs_int32 fbase; int count, willChangeEntry, foundUuidEntry, willReplaceCnt; int WillReplaceEntry, WillChange[MAXSERVERID+1], FoundUuid, ReplaceEntry; int srvidx, mhidx; *************** *** 2102,2110 **** afsUUID *uuidpo; afs_int32 *uniquifier, *nentries; bulkaddrs *addrsp; ! { register afs_int32 errorcode, index=-1, op, offset; struct ubik_trans *trans; ! int nservers, i, j, k, base=0; struct extentaddr *exp=0; afsUUID tuuid; afs_uint32 *taddrp, taddr; --- 2099,2107 ---- afsUUID *uuidpo; afs_int32 *uniquifier, *nentries; bulkaddrs *addrsp; ! { register afs_int32 errorcode, index=-1, offset; struct ubik_trans *trans; ! int nservers, i, j, base=0; struct extentaddr *exp=0; afsUUID tuuid; afs_uint32 *taddrp, taddr; *************** *** 2794,2800 **** int base, index, mhidx; afsUUID tuuid; afs_int32 blockindex, count; ! int pollcount; struct nvlentry tentry; if (!atrans) --- 2791,2797 ---- int base, index, mhidx; afsUUID tuuid; afs_int32 blockindex, count; ! int pollcount = 0; struct nvlentry tentry; if (!atrans) Index: openafs/src/vlserver/vlutils.c diff -c openafs/src/vlserver/vlutils.c:1.5 openafs/src/vlserver/vlutils.c:1.5.2.1 *** openafs/src/vlserver/vlutils.c:1.5 Tue Aug 7 20:04:22 2001 --- openafs/src/vlserver/vlutils.c Wed Sep 19 18:36:32 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlutils.c,v 1.5 2001/08/08 00:04:22 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vlserver/vlutils.c,v 1.5.2.1 2001/09/19 22:36:32 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 89,95 **** afs_int32 offset; char *buffer; afs_int32 length; { ! struct vlentry oentry, *oep; struct nvlentry nentry, *nep; char *bufp; register afs_int32 i; --- 89,95 ---- afs_int32 offset; char *buffer; afs_int32 length; { ! struct vlentry oentry; struct nvlentry nentry, *nep; char *bufp; register afs_int32 i; *************** *** 138,144 **** afs_int32 offset; char *buffer; afs_int32 length; { ! struct vlentry *oep, *obufp, tentry; struct nvlentry *nep, *nbufp; char *bufp = (char *)&tentry; register afs_int32 i; --- 138,144 ---- afs_int32 offset; char *buffer; afs_int32 length; { ! struct vlentry *oep, tentry; struct nvlentry *nep, *nbufp; char *bufp = (char *)&tentry; register afs_int32 i; *************** *** 475,481 **** *expp = exp; *basep = base; if (vldbversion != VLDBVERSION_4) { - vldbversion != VLDBVERSION_4; cheader.vital_header.vldbversion = htonl(VLDBVERSION_4); code = write_vital_vlheader(trans); if (code) ERROR_EXIT(VL_IO); --- 475,480 ---- *************** *** 628,633 **** --- 627,633 ---- VLog(0, ("[%d]#%d: %10d %d %d (%s)\n", hashindex, i, tentry.volumeId[0], tentry.nextIdHash[0], tentry.nextNameHash, tentry.name)); } + return 0; } *************** *** 645,650 **** --- 645,651 ---- VLog(0, ("[%d]#%d: %10d %d %d (%s)\n", hashindex, i, tentry.volumeId[0], tentry.nextIdHash[0], tentry.nextNameHash, tentry.name)); } + return 0; } Index: openafs/src/vol/clone.c diff -c openafs/src/vol/clone.c:1.5 openafs/src/vol/clone.c:1.5.2.1 *** openafs/src/vol/clone.c:1.5 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/clone.c Wed Sep 19 18:36:34 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/clone.c,v 1.5 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/clone.c,v 1.5.2.1 2001/09/19 22:36:34 shadow Exp $"); #include #include *************** *** 76,81 **** --- 76,84 ---- struct clone_items *last; }; + void CloneVolume(); + void CloneVolume_r(); + static ci_AddItem(ah, aino) Inode aino; struct clone_head *ah; { *************** *** 349,354 **** --- 352,358 ---- return error; } + void CloneVolume(error, original, new, old) Error *error; Volume *original, *new, *old; *************** *** 358,363 **** --- 362,368 ---- VOL_UNLOCK } + void CloneVolume_r(rerror, original, new, old) Error *rerror; Volume *original, *new, *old; Index: openafs/src/vol/devname.c diff -c openafs/src/vol/devname.c:1.7 openafs/src/vol/devname.c:1.7.2.1 *** openafs/src/vol/devname.c:1.7 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/devname.c Wed Sep 19 18:25:34 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/devname.c,v 1.7 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/devname.c,v 1.7.2.1 2001/09/19 22:25:34 shadow Exp $"); #include #include *************** *** 25,31 **** #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #else --- 25,31 ---- #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else *************** *** 33,39 **** #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ --- 33,39 ---- #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ Index: openafs/src/vol/listinodes.c diff -c openafs/src/vol/listinodes.c:1.8 openafs/src/vol/listinodes.c:1.8.4.1 *** openafs/src/vol/listinodes.c:1.8 Thu Jul 12 15:59:33 2001 --- openafs/src/vol/listinodes.c Wed Sep 19 18:25:34 2001 *************** *** 20,26 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/listinodes.c,v 1.8 2001/07/12 19:59:33 shadow Exp $"); #ifndef AFS_NAMEI_ENV #ifdef AFS_LINUX20_ENV --- 20,26 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/listinodes.c,v 1.8.4.1 2001/09/19 22:25:34 shadow Exp $"); #ifndef AFS_NAMEI_ENV #ifdef AFS_LINUX20_ENV *************** *** 52,58 **** #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #define itod ino_to_fsba --- 52,58 ---- #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #define itod ino_to_fsba *************** *** 1254,1260 **** if ( (super.fs.fs_magic != FS_MAGIC) || (super.fs.fs_ncg < 1) ! #if defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) || (super.fs.fs_cpg < 1) #else || (super.fs.fs_cpg < 1 || super.fs.fs_cpg > MAXCPG) --- 1254,1260 ---- if ( (super.fs.fs_magic != FS_MAGIC) || (super.fs.fs_ncg < 1) ! #if defined(AFS_SUN_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || (super.fs.fs_cpg < 1) #else || (super.fs.fs_cpg < 1 || super.fs.fs_cpg > MAXCPG) Index: openafs/src/vol/partition.c diff -c openafs/src/vol/partition.c:1.11 openafs/src/vol/partition.c:1.11.4.2 *** openafs/src/vol/partition.c:1.11 Thu Jul 12 15:59:33 2001 --- openafs/src/vol/partition.c Wed Sep 19 18:36:34 2001 *************** *** 18,24 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/partition.c,v 1.11 2001/07/12 19:59:33 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 18,24 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/partition.c,v 1.11.4.2 2001/09/19 22:36:34 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 32,38 **** #if AFS_HAVE_STATVFS #include #endif /* AFS_HAVE_STATVFS */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #endif --- 32,38 ---- #if AFS_HAVE_STATVFS #include #endif /* AFS_HAVE_STATVFS */ ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #endif *************** *** 46,52 **** #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #else --- 46,52 ---- #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else *************** *** 54,60 **** #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ --- 54,60 ---- #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ *************** *** 456,462 **** } #endif ! #if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) int VAttachPartitions(void) { int errors = 0; --- 456,462 ---- } #endif ! #if defined(AFS_DUX40_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int VAttachPartitions(void) { int errors = 0; *************** *** 803,809 **** void VAdjustDiskUsage_r(Error *ec, Volume *vp, afs_int32 blocks, afs_int32 checkBlocks) { - afs_int32 rem, minavail; *ec = 0; /* why blocks instead of checkBlocks in the check below? Otherwise, any check for less than BlocksSpare would skip the error-checking path, and we --- 803,808 ---- *************** *** 811,816 **** --- 810,817 ---- blocks. */ if (blocks > 0) { #ifdef AFS_AIX32_ENV + afs_int32 rem, minavail; + if ((rem = vp->partition->free - checkBlocks) < (minavail = (vp->partition->totalUsable * aixlow_water) / 100)) #else *************** *** 833,841 **** int VDiskUsage_r(Volume *vp, afs_int32 blocks) { - afs_int32 rem, minavail; if (blocks > 0) { #ifdef AFS_AIX32_ENV if ((rem = vp->partition->free - blocks) < (minavail = (vp->partition->totalUsable * aixlow_water) / 100)) #else --- 834,843 ---- int VDiskUsage_r(Volume *vp, afs_int32 blocks) { if (blocks > 0) { #ifdef AFS_AIX32_ENV + afs_int32 rem, minavail; + if ((rem = vp->partition->free - blocks) < (minavail = (vp->partition->totalUsable * aixlow_water) / 100)) #else Index: openafs/src/vol/vnode.c diff -c openafs/src/vol/vnode.c:1.5 openafs/src/vol/vnode.c:1.5.2.1 *** openafs/src/vol/vnode.c:1.5 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/vnode.c Wed Sep 19 18:36:34 2001 *************** *** 16,22 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vnode.c,v 1.5 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 16,22 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vnode.c,v 1.5.2.1 2001/09/19 22:36:34 shadow Exp $"); #include #include *************** *** 60,65 **** --- 60,67 ---- struct VnodeClassInfo VnodeClassInfo[nVNODECLASSES]; private int moveHash(); + void StickOnLruChain_r(); + void VPutVnode_r(); #define BAD_IGET -1000 *************** *** 183,189 **** } if (nVnodes == 0) ! return; va = (byte *) calloc(nVnodes,vcp->residentSize); assert (va != NULL); --- 185,191 ---- } if (nVnodes == 0) ! return 0; va = (byte *) calloc(nVnodes,vcp->residentSize); assert (va != NULL); *************** *** 214,219 **** --- 216,222 ---- } va += vcp->residentSize; } + return 0; } *************** *** 360,366 **** LWP_CurrentProcess(&vnp->writer); #endif /* AFS_PTHREAD_ENV */ /* Sanity check: is this vnode really not in use? */ ! { int n; int size; IHandle_t *ihP = vp->vnodeIndex[class].handle; FdHandle_t *fdP; --- 363,369 ---- LWP_CurrentProcess(&vnp->writer); #endif /* AFS_PTHREAD_ENV */ /* Sanity check: is this vnode really not in use? */ ! { int size; IHandle_t *ihP = vp->vnodeIndex[class].handle; FdHandle_t *fdP; *************** *** 653,659 **** int TrustVnodeCacheEntry = 1; /* This variable is bogus--when it's set to 0, the hash chains fill up with multiple versions of the same vnode. Should fix this!! */ ! VPutVnode(ec,vnp) Error *ec; register Vnode *vnp; --- 656,662 ---- int TrustVnodeCacheEntry = 1; /* This variable is bogus--when it's set to 0, the hash chains fill up with multiple versions of the same vnode. Should fix this!! */ ! void VPutVnode(ec,vnp) Error *ec; register Vnode *vnp; *************** *** 663,668 **** --- 666,672 ---- VOL_UNLOCK } + void VPutVnode_r(ec,vnp) Error *ec; register Vnode *vnp; *************** *** 911,918 **** --- 915,924 ---- vnp->hashNext = VnodeHashTable[newHash]; VnodeHashTable[newHash] = vnp; vnp->hashIndex = newHash; + return 0; } + void StickOnLruChain_r(vnp,vcp) register Vnode *vnp; register struct VnodeClassInfo *vcp; Index: openafs/src/vol/vol-salvage.c diff -c openafs/src/vol/vol-salvage.c:1.10 openafs/src/vol/vol-salvage.c:1.10.2.2 *** openafs/src/vol/vol-salvage.c:1.10 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/vol-salvage.c Wed Sep 19 18:36:34 2001 *************** *** 91,97 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vol-salvage.c,v 1.10 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 91,97 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vol-salvage.c,v 1.10.2.2 2001/09/19 22:36:34 shadow Exp $"); #include #include *************** *** 122,128 **** #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #else --- 122,128 ---- #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else *************** *** 133,139 **** #ifdef AFS_OSF_ENV #include #else /* AFS_OSF_ENV */ ! #if !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif --- 133,139 ---- #ifdef AFS_OSF_ENV #include #else /* AFS_OSF_ENV */ ! #if !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif *************** *** 1424,1430 **** int GetInodeSummary(char *path, VolumeId singleVolumeNumber) { struct stat status; ! int summaryFd, forceSal, err; struct ViceInodeInfo *ip; struct InodeSummary summary; char summaryFileName[50]; --- 1424,1430 ---- int GetInodeSummary(char *path, VolumeId singleVolumeNumber) { struct stat status; ! int forceSal, err; struct ViceInodeInfo *ip; struct InodeSummary summary; char summaryFileName[50]; *************** *** 2920,2926 **** struct VnodeClassInfo *vcp = &VnodeClassInfo[class]; char buf[SIZEOF_LARGEDISKVNODE]; struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf; - int code; int size; StreamHandle_t *file; int vnodeIndex; --- 2920,2925 ---- *************** *** 3444,3450 **** char buf[4096]; IHandle_t *srcH, *destH; FdHandle_t *srcFdP, *destFdP; ! register int n; IH_INIT(srcH, device, rwvolume, inode1); srcFdP = IH_OPEN(srcH); --- 3443,3449 ---- char buf[4096]; IHandle_t *srcH, *destH; FdHandle_t *srcFdP, *destFdP; ! register int n = 0; IH_INIT(srcH, device, rwvolume, inode1); srcFdP = IH_OPEN(srcH); Index: openafs/src/vol/volume.c diff -c openafs/src/vol/volume.c:1.12 openafs/src/vol/volume.c:1.12.2.1 *** openafs/src/vol/volume.c:1.12 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/volume.c Wed Sep 19 18:25:35 2001 *************** *** 19,25 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/volume.c,v 1.12 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 19,25 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/volume.c,v 1.12.2.1 2001/09/19 22:25:35 shadow Exp $"); #include #include *************** *** 35,41 **** #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) #include #include #else --- 35,41 ---- #ifdef AFS_SUN5_ENV #include #else ! #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #include #include #else *************** *** 43,49 **** #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_FBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ --- 43,49 ---- #endif #endif #else /* AFS_VFSINCL_ENV */ ! #if !defined(AFS_AIX_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_XBSD_ENV) #include #endif #endif /* AFS_VFSINCL_ENV */ Index: openafs/src/vol/vutil.c diff -c openafs/src/vol/vutil.c:1.6 openafs/src/vol/vutil.c:1.6.2.1 *** openafs/src/vol/vutil.c:1.6 Tue Aug 7 20:04:23 2001 --- openafs/src/vol/vutil.c Wed Sep 19 18:36:34 2001 *************** *** 17,23 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vutil.c,v 1.6 2001/08/08 00:04:23 shadow Exp $"); #include #include --- 17,23 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/vol/vutil.c,v 1.6.2.1 2001/09/19 22:36:34 shadow Exp $"); #include #include *************** *** 64,70 **** --- 64,75 ---- #include #endif + void AssignVolumeName(); + void AssignVolumeName_r(); + void ClearVolumeStats(); + void ClearVolumeStats_r(); + #define nFILES (sizeof (stuff)/sizeof(struct stuff)) /* Note: the volume creation functions herein leave the destroyMe flag in the *************** *** 110,128 **** no parent */ { VolumeDiskData vol; ! int fd, fd1, i; char headerName[32], volumePath[64]; - struct stat status; Device device; struct DiskPartition *partition; struct VolumeDiskHeader diskHeader; - int code; IHandle_t *handle; FdHandle_t *fdP; Inode nearInode=0; - - *ec = 0; memset(&vol, 0, sizeof (vol)); vol.id = volumeId; --- 115,129 ---- no parent */ { VolumeDiskData vol; ! int fd, i; char headerName[32], volumePath[64]; Device device; struct DiskPartition *partition; struct VolumeDiskHeader diskHeader; IHandle_t *handle; FdHandle_t *fdP; Inode nearInode=0; *ec = 0; memset(&vol, 0, sizeof (vol)); vol.id = volumeId; *************** *** 279,284 **** --- 280,286 ---- } + void AssignVolumeName(vol, name, ext) register VolumeDiskData *vol; char *name,*ext; *************** *** 288,293 **** --- 290,296 ---- VOL_UNLOCK } + void AssignVolumeName_r(vol, name, ext) register VolumeDiskData *vol; char *name,*ext; *************** *** 338,343 **** --- 341,347 ---- return(code); } + void ClearVolumeStats(vol) register VolumeDiskData *vol; { *************** *** 346,351 **** --- 350,356 ---- VOL_UNLOCK } + void ClearVolumeStats_r(vol) register VolumeDiskData *vol; { Index: openafs/src/volser/NTMakefile diff -c openafs/src/volser/NTMakefile:1.2 openafs/src/volser/NTMakefile:1.2.8.1 *** openafs/src/volser/NTMakefile:1.2 Sat Nov 4 05:06:31 2000 --- openafs/src/volser/NTMakefile Wed Sep 19 18:32:57 2001 *************** *** 158,162 **** # Local clean target; augments predefined clean target clean:: ! ! --- 158,162 ---- # Local clean target; augments predefined clean target clean:: ! $(DEL) volerr.c volser.h ! $(DEL) volint.cs.c volint.h volint.ss.c volint.xdr.c volser.h Index: openafs/src/volser/common.c diff -c openafs/src/volser/common.c:1.4 openafs/src/volser/common.c:1.4.4.2 *** openafs/src/volser/common.c:1.4 Thu Jul 12 15:59:34 2001 --- openafs/src/volser/common.c Wed Sep 19 18:40:45 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/common.c,v 1.4 2001/07/12 19:59:34 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/common.c,v 1.4.4.2 2001/09/19 22:40:45 shadow Exp $"); #include #include *************** *** 36,49 **** abort(); } InitErrTabs() { ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); ! initialize_vols_error_table(); return; } --- 36,50 ---- abort(); } + void InitErrTabs() { ! initialize_KA_error_table(); ! initialize_RXK_error_table(); ! initialize_KTC_error_table(); ! initialize_ACFG_error_table(); ! initialize_CMD_error_table(); ! initialize_VL_error_table(); ! initialize_VOLS_error_table(); return; } Index: openafs/src/volser/dumpstuff.c diff -c openafs/src/volser/dumpstuff.c:1.6 openafs/src/volser/dumpstuff.c:1.6.2.1 *** openafs/src/volser/dumpstuff.c:1.6 Tue Aug 7 20:04:26 2001 --- openafs/src/volser/dumpstuff.c Wed Sep 19 18:36:35 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/dumpstuff.c,v 1.6 2001/08/08 00:04:26 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/dumpstuff.c,v 1.6.2.1 2001/09/19 22:36:35 shadow Exp $"); #include #include *************** *** 417,423 **** { int code = 0, lcode = 0, error = 0; afs_int32 pad = 0, offset; ! int n, nbytes, howMany; byte *p; struct stat status; int size; --- 417,423 ---- { int code = 0, lcode = 0, error = 0; afs_int32 pad = 0, offset; ! int n, nbytes, howMany, howBig; byte *p; struct stat status; int size; *************** *** 427,435 **** #endif #ifdef AFS_NT40_ENV ! howMany = 4096; /* Page size */ #else fstat(handleP->fd_fd, &status); #ifdef AFS_AIX_ENV /* Unfortunately in AIX valuable fields such as st_blksize are * gone from the stat structure. --- 427,439 ---- #endif #ifdef AFS_NT40_ENV ! howBig = _filelength(handleP->fd_fd); ! howMany = 4096; ! #else fstat(handleP->fd_fd, &status); + howBig = status.st_size; + #ifdef AFS_AIX_ENV /* Unfortunately in AIX valuable fields such as st_blksize are * gone from the stat structure. *************** *** 438,446 **** howMany = tstatfs.f_bsize; #else howMany = status.st_blksize; ! #endif #endif /* AFS_NT40_ENV */ size = FDH_SIZE(handleP); code = DumpInt32(iodp, tag, size); if (code) { --- 442,451 ---- howMany = tstatfs.f_bsize; #else howMany = status.st_blksize; ! #endif /* AFS_AIX_ENV */ #endif /* AFS_NT40_ENV */ + size = FDH_SIZE(handleP); code = DumpInt32(iodp, tag, size); if (code) { *************** *** 490,496 **** */ memset(p+n, 0, howMany-n); if (!pad) ! offset = (status.st_size - nbytes) + n; pad += (howMany-n); /* Now seek over the data we could not get. An error here means we --- 495,501 ---- */ memset(p+n, 0, howMany-n); if (!pad) ! offset = (howBig - nbytes) + n; pad += (howMany-n); /* Now seek over the data we could not get. An error here means we *************** *** 631,637 **** char buf[SIZEOF_LARGEDISKVNODE]; struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf; StreamHandle_t *file; - IHandle_t *handle; FdHandle_t *fdP; int size; int flag; --- 636,641 ---- Index: openafs/src/volser/lockprocs.c diff -c openafs/src/volser/lockprocs.c:1.4 openafs/src/volser/lockprocs.c:1.4.4.1 *** openafs/src/volser/lockprocs.c:1.4 Thu Jul 12 15:59:34 2001 --- openafs/src/volser/lockprocs.c Wed Sep 19 18:36:35 2001 *************** *** 17,23 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/lockprocs.c,v 1.4 2001/07/12 19:59:34 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 17,23 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/lockprocs.c,v 1.4.4.1 2001/09/19 22:36:35 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 71,76 **** --- 71,77 ---- } /* Changes the rw site only */ + void SetAValue (entry, oserver, opart, nserver, npart, type) struct nvldbentry *entry; afs_int32 oserver, opart, nserver, npart, type; Index: openafs/src/volser/volerr.et diff -c openafs/src/volser/volerr.et:1.2 openafs/src/volser/volerr.et:1.2.8.1 *** openafs/src/volser/volerr.et:1.2 Sat Nov 4 05:06:33 2000 --- openafs/src/volser/volerr.et Wed Sep 19 18:40:45 2001 *************** *** 10,16 **** # NOTE: VOLSERBAD_ACCESS value is hardcoded in audit/audit.h, so if you # make changes here, make sure that audit/audit.h is kept up to date. ! error_table vols ec VOLSERTRELE_ERROR, "internal error releasing transaction" ec VOLSERNO_OP, "unknown internal error" ec VOLSERREAD_DUMPERROR, "badly formatted dump" --- 10,16 ---- # NOTE: VOLSERBAD_ACCESS value is hardcoded in audit/audit.h, so if you # make changes here, make sure that audit/audit.h is kept up to date. ! error_table VOLS ec VOLSERTRELE_ERROR, "internal error releasing transaction" ec VOLSERNO_OP, "unknown internal error" ec VOLSERREAD_DUMPERROR, "badly formatted dump" Index: openafs/src/volser/volprocs.c diff -c openafs/src/volser/volprocs.c:1.6 openafs/src/volser/volprocs.c:1.6.2.1 *** openafs/src/volser/volprocs.c:1.6 Tue Aug 7 20:04:26 2001 --- openafs/src/volser/volprocs.c Wed Sep 19 18:36:35 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/volprocs.c,v 1.6 2001/08/08 00:04:26 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/volprocs.c,v 1.6.2.1 2001/09/19 22:36:35 shadow Exp $"); #include #include *************** *** 1584,1596 **** struct rx_call *acid; struct pIDs *partIds; { - struct stat rbuf, pbuf; char namehead[9]; int code; char i; #ifdef AFS_NT40_ENV /* Just return attached partitions. */ - strcpy(namehead, "/vicep"); namehead[7] = '\0'; for (i=0; i<26; i++) { namehead[6] = i + 'a'; --- 1584,1598 ---- struct rx_call *acid; struct pIDs *partIds; { char namehead[9]; + struct stat rbuf, pbuf; int code; char i; + + strcpy(namehead, "/vicep"); /*7 including null terminator*/ + #ifdef AFS_NT40_ENV /* Just return attached partitions. */ namehead[7] = '\0'; for (i=0; i<26; i++) { namehead[6] = i + 'a'; *************** *** 1598,1606 **** partIds->partIds[i] = VGetPartition(namehead, 0) ? i : -1; } #else - strcpy(namehead, "/vicep"); /*7 including null terminator*/ - code = stat("/",&rbuf); /*interested in buf->st_dev*/ for(i = 0 ; i < 26 ; i++){ --- 1600,1607 ---- partIds->partIds[i] = VGetPartition(namehead, 0) ? i : -1; } #else + (void) stat("/",&rbuf); /*interested in buf->st_dev*/ for(i = 0 ; i < 26 ; i++){ *************** *** 1613,1620 **** else partIds->partIds[i ] = -1; } else partIds->partIds[i ] = -1; - - } #endif return 0; --- 1614,1619 ---- Index: openafs/src/volser/vos.c diff -c openafs/src/volser/vos.c:1.8 openafs/src/volser/vos.c:1.8.2.1 *** openafs/src/volser/vos.c:1.8 Tue Aug 7 20:04:26 2001 --- openafs/src/volser/vos.c Wed Sep 19 18:36:35 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vos.c,v 1.8 2001/08/08 00:04:26 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vos.c,v 1.8.2.1 2001/09/19 22:36:35 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 3153,3159 **** if (vcode == RXGEN_OPCODE) { /* Vlserver not running with ListAttributesN2. Fall back */ vcode = VLDB_ListAttributes(&attributes, ¢ries, &arrayEntries); ! nextindex == -1; } if (vcode) { fprintf(STDERR,"Could not access the VLDB for attributes\n"); --- 3153,3159 ---- if (vcode == RXGEN_OPCODE) { /* Vlserver not running with ListAttributesN2. Fall back */ vcode = VLDB_ListAttributes(&attributes, ¢ries, &arrayEntries); ! nextindex = -1; } if (vcode) { fprintf(STDERR,"Could not access the VLDB for attributes\n"); Index: openafs/src/volser/vsprocs.c diff -c openafs/src/volser/vsprocs.c:1.6 openafs/src/volser/vsprocs.c:1.6.2.2 *** openafs/src/volser/vsprocs.c:1.6 Tue Aug 7 20:04:26 2001 --- openafs/src/volser/vsprocs.c Wed Sep 19 18:40:45 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vsprocs.c,v 1.6 2001/08/08 00:04:26 shadow Exp $"); #include #include --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vsprocs.c,v 1.6.2.2 2001/09/19 22:40:45 shadow Exp $"); #include #include *************** *** 65,76 **** --- 65,80 ---- extern int VL_ReleaseLock(); extern int VL_DeleteEntry(); + void MapNetworkToHost(); + void MapHostToNetwork(); + struct release { afs_int32 time; afs_int32 vldbEntryIndex; }; /*map the partition into partition name */ + void MapPartIdIntoName(partId, partName) afs_int32 partId; char *partName; *************** *** 79,92 **** strcpy(partName,"/vicep"); partName[6] = partId + 'a'; partName[7] = '\0'; ! return 0; } else if (partId < VOLMAXPARTS) { strcpy(partName,"/vicep"); partId -= 26; partName[6] = 'a' + (partId/26); partName[7] = 'a' + (partId%26); partName[8] = '\0'; ! return 0; } } --- 83,96 ---- strcpy(partName,"/vicep"); partName[6] = partId + 'a'; partName[7] = '\0'; ! return; } else if (partId < VOLMAXPARTS) { strcpy(partName,"/vicep"); partId -= 26; partName[6] = 'a' + (partId/26); partName[7] = 'a' + (partId%26); partName[8] = '\0'; ! return; } } *************** *** 228,239 **** afs_int32 offset; ! initialize_ka_error_table(); ! initialize_rxk_error_table(); ! initialize_ktc_error_table(); ! initialize_acfg_error_table(); ! initialize_cmd_error_table(); ! initialize_vl_error_table(); offset = errcode & ((1<name); --- 368,373 ---- *************** *** 535,543 **** afs_int32 aid; { register struct rx_connection *aconn; - register afs_int32 code; afs_int32 error; ! afs_int32 rcode,vcode; struct nvldbentry entry,storeEntry;/*the new vldb entry */ aconn = (struct rx_connection *)0; --- 536,543 ---- afs_int32 aid; { register struct rx_connection *aconn; afs_int32 error; ! afs_int32 vcode; struct nvldbentry entry,storeEntry;/*the new vldb entry */ aconn = (struct rx_connection *)0; *************** *** 1760,1766 **** struct rx_connection *conn; afs_int32 vid, part, flags; { ! afs_int32 acode, bcode, ccode, rcode, tid; ccode = rcode = tid = 0; acode = AFSVolTransCreate(conn, vid, part, flags, &tid); --- 1760,1766 ---- struct rx_connection *conn; afs_int32 vid, part, flags; { ! afs_int32 acode, ccode, rcode, tid; ccode = rcode = tid = 0; acode = AFSVolTransCreate(conn, vid, part, flags, &tid); *************** *** 1931,1937 **** afs_int32 cloneVolId, roVolId; struct replica *replicas=0; struct nvldbentry entry,storeEntry; ! int i, volcount, k, m, n, fullrelease, vldbindex; int failure; struct restoreCookie cookie; struct rx_connection **toconns=0; --- 1931,1937 ---- afs_int32 cloneVolId, roVolId; struct replica *replicas=0; struct nvldbentry entry,storeEntry; ! int i, volcount, m, fullrelease, vldbindex; int failure; struct restoreCookie cookie; struct rx_connection **toconns=0; *************** *** 1943,1949 **** afs_int32 clonetid=0, onlinetid; afs_int32 fromtid=0; afs_uint32 fromdate, thisdate; ! int ix, si, s; manyDests tr; manyResults results; int rwindex, roindex, roclone, roexists; --- 1943,1949 ---- afs_int32 clonetid=0, onlinetid; afs_int32 fromtid=0; afs_uint32 fromdate, thisdate; ! int s; manyDests tr; manyResults results; int rwindex, roindex, roclone, roexists; *************** *** 3491,3497 **** int idx, j; afs_int32 code, error = 0; struct nvldbentry entry, storeEntry; - int sameserver; char pname[10]; int pass=0, islocked=0, createentry, addvolume, modified, mod; afs_int32 rwvolid; --- 3491,3496 ---- *************** *** 4402,4411 **** afs_int32 *modified; { afs_int32 code, error=0; - int idx; struct nvldbentry storeEntry; int islocked=0, mod, modentry, delentry=0; ! int foundro, pass=0; if (modified) *modified = 0; if (verbose) { --- 4401,4409 ---- afs_int32 *modified; { afs_int32 code, error=0; struct nvldbentry storeEntry; int islocked=0, mod, modentry, delentry=0; ! int pass=0; if (modified) *modified = 0; if (verbose) { *************** *** 4926,4931 **** --- 4924,4930 ---- /*maps the host addresses in (present in network byte order) to that in< new> (present in host byte order )*/ + void MapNetworkToHost(old, new) struct nvldbentry *old, *new; { *************** *** 4947,4956 **** new->volumeId[BACKVOL] = old->volumeId[BACKVOL]; new->cloneId = old->cloneId; new->flags = old->flags; - } /*maps the host entries in which are present in host byte order to network byte order */ MapHostToNetwork(entry) struct nvldbentry *entry; { --- 4946,4955 ---- new->volumeId[BACKVOL] = old->volumeId[BACKVOL]; new->cloneId = old->cloneId; new->flags = old->flags; } /*maps the host entries in which are present in host byte order to network byte order */ + void MapHostToNetwork(entry) struct nvldbentry *entry; { Index: openafs/src/volser/vsutils.c diff -c openafs/src/volser/vsutils.c:1.7 openafs/src/volser/vsutils.c:1.7.2.1 *** openafs/src/volser/vsutils.c:1.7 Tue Aug 7 20:04:26 2001 --- openafs/src/volser/vsutils.c Wed Sep 19 18:36:36 2001 *************** *** 10,16 **** #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vsutils.c,v 1.7 2001/08/08 00:04:26 shadow Exp $"); #include #ifdef AFS_NT40_ENV --- 10,16 ---- #include #include ! RCSID("$Header: /data/cvs/openafs/src/volser/vsutils.c,v 1.7.2.1 2001/09/19 22:36:36 shadow Exp $"); #include #ifdef AFS_NT40_ENV *************** *** 105,111 **** struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code, (*nproc)(); if (newvlserver == 1) { tryold: --- 105,111 ---- struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code; if (newvlserver == 1) { tryold: *************** *** 132,138 **** struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code, (*nproc)(); if (newvlserver == 1) { tryold: --- 132,138 ---- struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code; if (newvlserver == 1) { tryold: *************** *** 158,164 **** struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code, (*nproc)(); if (newvlserver == 1) { tryold: --- 158,164 ---- struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code; if (newvlserver == 1) { tryold: *************** *** 184,190 **** struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code, (*nproc)(); if (newvlserver == 1) { tryold: --- 184,190 ---- struct nvldbentry *entryp; { struct vldbentry oentry; ! register int code; if (newvlserver == 1) { tryold: *************** *** 270,277 **** VLDB_IsSameAddrs(serv1, serv2, errorp) afs_int32 serv1, serv2, *errorp; { ! struct vldbentry oentry; ! register int code, (*nproc)(); ListAddrByAttributes attrs; bulkaddrs addrs; afs_uint32 *addrp, nentries, unique, i, j, f1, f2; --- 270,276 ---- VLDB_IsSameAddrs(serv1, serv2, errorp) afs_int32 serv1, serv2, *errorp; { ! register int code; ListAddrByAttributes attrs; bulkaddrs addrs; afs_uint32 *addrp, nentries, unique, i, j, f1, f2; *************** *** 536,542 **** char *str,*ptr, volname[VOLSER_OLDMAXVOLNAME+1]; int tryname, curval; struct nvldbentry entry; ! afs_int32 vcode; int total; *errp = 0; --- 535,541 ---- char *str,*ptr, volname[VOLSER_OLDMAXVOLNAME+1]; int tryname, curval; struct nvldbentry entry; ! afs_int32 vcode = 0; int total; *errp = 0;