19July06

[bacula/bacula] / bacula / src / lib / attr.h

diff --git a/bacula/src/lib/attr.h b/bacula/src/lib/attr.h
index 572339426688eb1fe85a38c8e6e8d8feaa72cb69..b510017a6fbe4547ef6d64b7f91e0d06140b2f67 100644 (file)
--- a/bacula/src/lib/attr.h
+++ b/bacula/src/lib/attr.h
@@ -1,31 +1,26 @@
 /*
  *   attr.h Definition of attributes packet for unpacking from tape
- * 
+ *
  *    Kern Sibbald, June MMIII
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2003-2006 Kern Sibbald
 
    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 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
+
 struct ATTR {
    int32_t stream;                    /* attribute stream id */
    int32_t data_stream;               /* id of data stream to follow */
@@ -33,10 +28,15 @@ struct ATTR {
    int32_t file_index;                /* file index */
    int32_t LinkFI;                    /* file index to data if hard link */
    struct stat statp;                 /* decoded stat packet */
+   POOLMEM *attrEx;                   /* extended attributes if any */
+   POOLMEM *ofname;                   /* output filename */
+   POOLMEM *olname;                   /* output link name */
+   /*
+    * Note the following three variables point into the
+    *  current BSOCK record, so they are invalid after
+    *  the next socket read!
+    */
    char *attr;                        /* attributes position */
-   char *attrEx;                      /* extended attributes if any */
    char *fname;                       /* filename */
    char *lname;                       /* link name if any */
-   POOLMEM *ofname;                   /* output filename */
-   POOLMEM *olname;                   /* output link name */
 };