From 0a95fba13903b57a1f72bc759334a2eae924edad Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 5 Nov 2000 19:31:49 +0000 Subject: [PATCH] New upstream version merges --- src/Makefile | 8 +++- src/afs/UKERNEL/sysincludes.h | 8 +++- src/afsd/afs.rc.linux | 8 +++- src/config/Makefile.i386_linux22 | 9 +++- src/util/dirpath.h | 9 ++++ src/vfsck/libfs.h | 73 -------------------------------- 6 files changed, 35 insertions(+), 80 deletions(-) delete mode 100644 src/vfsck/libfs.h diff --git a/src/Makefile b/src/Makefile index 8ebc0b70c..9d6c1e173 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,9 @@ -#/* Copyright (C) 1990, 1989 Transarc Corporation - All rights reserved */ - +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html SHELL=/bin/sh DESTDIR=dest/ diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 732874f64..55a3ab2b0 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -1,6 +1,10 @@ /* - * (C) COPYRIGHT IBM CORPORATION 1998 - * LICENSED MATERIALS - PROPERTY OF IBM + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html */ #ifndef __AFS_SYSINCLUDESH__ diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux index a4cfb9673..5ad3555ab 100644 --- a/src/afsd/afs.rc.linux +++ b/src/afsd/afs.rc.linux @@ -1,5 +1,11 @@ #! /bin/sh -# +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html + # AFS Start and stop AFS components # # diff --git a/src/config/Makefile.i386_linux22 b/src/config/Makefile.i386_linux22 index 331ef2181..0128d4d26 100644 --- a/src/config/Makefile.i386_linux22 +++ b/src/config/Makefile.i386_linux22 @@ -1,5 +1,10 @@ -# Copyright 1998 Transarc Corporation -# +# Copyright 2000, International Business Machines Corporation and others. +# All Rights Reserved. +# +# This software has been released under the terms of the IBM Public +# License. For details, see the LICENSE file in the top-level source +# directory or online at http://www.openafs.org/dl/license10.html + # Keep macros within each section in sorted order for clean diff displays. # # AFS_OSTYPE used to indicate suffixes and os specific subdirectories. diff --git a/src/util/dirpath.h b/src/util/dirpath.h index 197e248c8..7b4f7a14f 100644 --- a/src/util/dirpath.h +++ b/src/util/dirpath.h @@ -1,6 +1,15 @@ /* Changed for Debian by Sam Hartman * conform to FHS */ +/* + * Copyright 2000, International Business Machines Corporation and others. + * All Rights Reserved. + * + * This software has been released under the terms of the IBM Public + * License. For details, see the LICENSE file in the top-level source + * directory or online at http://www.openafs.org/dl/license10.html + + */ /* Copyright (C) 1998 Transarc Corporation - All rights reserved. */ diff --git a/src/vfsck/libfs.h b/src/vfsck/libfs.h deleted file mode 100644 index 769c9f919..000000000 --- a/src/vfsck/libfs.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * $Revision: 1.1 $ - */ - -/* - * libfs.h: - * Contains declarations and macro definitions utilized by source - * files that make up the libfs library. - * - * This file is local to the build environment. - * One can include this header in their code with the statement: - * #include - */ - -/* - * This file is part of the HP-YUX source code and shouls not be released - * to AFS customers unless thay have a source license - */ - -#ifndef _STDIO_INCLUDED -# include /* For FILE definition */ -#endif -#ifndef _SYS_FS_INCLUDED -# include /* For UFS_*(fs) macro definitions */ -#endif - -/* - * Useful macros used by many FS commands - */ - -#define VALID_FS_MAGIC(fs) UFS_VALID_FS_MAGIC(fs) /* in */ -#define LONG_FILENAME_FS(fs) UFS_LFN_FS(fs) /* in */ - -/* - * Return Values from LongFilenameOK() - */ -#define LFN_ERROR (-1) -#define LFN_NOT_OK 0 -#define LFN_OK 1 - -/* - * Values returned by setup_block_seek() - */ -#define BLKSEEK_PROCESSING_ERROR (-2) -#define BLKSEEK_FILE_WRITEONLY (-1) -#define BLKSEEK_NOT_ENABLED 0 -#define BLKSEEK_ENABLED 1 - -/* - * extern declarations of libfs routines. - */ -typedef int boolean; - -#ifdef _PROTOTYPES - extern boolean is_mounted(char *); - extern boolean IsSwap(char *); - extern FILE *mnt_setmntent(char *, char *); - extern int LongFilenameOK(char *); - extern char *fserror(char *); - extern void set_fserror(char *); - extern int setup_block_seek(int); - extern int setup_block_seek_2(int,int *); -#else - extern boolean is_mounted(); - extern boolean IsSwap(); - extern FILE *mnt_setmntent(); - extern int LongFilenameOK(); - extern char *fserror(); - extern void set_fserror(); - extern int setup_block_seek(); - extern int setup_block_seek_2(); -#endif - -- 2.39.5