Thu Mar 11 01:13:11 2021 UTC ()
s/skiping/skipping/


(msaitoh)
diff -r1.2 -r1.3 src/lib/libc/gen/extattr_copy_file.3
diff -r1.69 -r1.70 src/sbin/restore/tape.c
cvs diff -r1.2 -r1.3 src/lib/libc/gen/extattr_copy_file.3 (expand / switch to unified diff)

--- src/lib/libc/gen/extattr_copy_file.3 2011/12/16 15:21:13 1.2
+++ src/lib/libc/gen/extattr_copy_file.3 2021/03/11 01:13:11 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: extattr_copy_file.3,v 1.2 2011/12/16 15:21:13 manu Exp $ 1.\" $NetBSD: extattr_copy_file.3,v 1.3 2021/03/11 01:13:11 msaitoh Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Dima Dorfman <dd@FreeBSD.org> 3.\" Copyright (c) 2001 Dima Dorfman <dd@FreeBSD.org>
4.\" Copyright (c) 2011 Emmanuel Dreyfus <manu@NetBSD.org> 4.\" Copyright (c) 2011 Emmanuel Dreyfus <manu@NetBSD.org>
5.\" All rights reserved. 5.\" All rights reserved.
6.\" 6.\"
7.\" Redistribution and use in source and binary forms, with or without 7.\" Redistribution and use in source and binary forms, with or without
8.\" modification, are permitted provided that the following conditions 8.\" modification, are permitted provided that the following conditions
9.\" are met: 9.\" are met:
10.\" 1. Redistributions of source code must retain the above copyright 10.\" 1. Redistributions of source code must retain the above copyright
11.\" notice, this list of conditions and the following disclaimer. 11.\" notice, this list of conditions and the following disclaimer.
12.\" 2. Redistributions in binary form must reproduce the above copyright 12.\" 2. Redistributions in binary form must reproduce the above copyright
13.\" notice, this list of conditions and the following disclaimer in the 13.\" notice, this list of conditions and the following disclaimer in the
14.\" documentation and/or other materials provided with the distribution. 14.\" documentation and/or other materials provided with the distribution.
@@ -66,27 +66,27 @@ does the same as @@ -66,27 +66,27 @@ does the same as
66.Fn extattr_copy_file 66.Fn extattr_copy_file
67but operates on symbolic links themselves instead of their targets. 67but operates on symbolic links themselves instead of their targets.
68.Pp 68.Pp
69.Fn cpxattr , 69.Fn cpxattr ,
70.Fn fcpxattr , 70.Fn fcpxattr ,
71and 71and
72.Fn lcpxattr 72.Fn lcpxattr
73respectively work the same was as 73respectively work the same was as
74.Fn extattr_copy_file , 74.Fn extattr_copy_file ,
75.Fn extattr_copy_fd , 75.Fn extattr_copy_fd ,
76and 76and
77.Fn extattr_copy_link , 77.Fn extattr_copy_link ,
78but will copy extended attributes from all namespaces accessible to the user, 78but will copy extended attributes from all namespaces accessible to the user,
79silently skiping unaccessible namespaces. 79silently skipping unaccessible namespaces.
80.Pp 80.Pp
81Please note that none of the extended attribute copying functions are atomic. 81Please note that none of the extended attribute copying functions are atomic.
82.Sh RETURN VALUES 82.Sh RETURN VALUES
83If any of the calls are unsuccessful, the value \-1 is returned 83If any of the calls are unsuccessful, the value \-1 is returned
84and the global variable 84and the global variable
85.Va errno 85.Va errno
86is set to indicate the error. 86is set to indicate the error.
87.Sh ERRORS 87.Sh ERRORS
88Extended attribute copying functions may raise errors produced by 88Extended attribute copying functions may raise errors produced by
89.Xr extattr_list_file 2 89.Xr extattr_list_file 2
90and 90and
91.Xr extattr_get_file 2 . 91.Xr extattr_get_file 2 .
92.Sh SEE ALSO 92.Sh SEE ALSO
cvs diff -r1.69 -r1.70 src/sbin/restore/tape.c (expand / switch to unified diff)

--- src/sbin/restore/tape.c 2020/09/03 19:31:34 1.69
+++ src/sbin/restore/tape.c 2021/03/11 01:13:11 1.70
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tape.c,v 1.69 2020/09/03 19:31:34 bouyer Exp $ */ 1/* $NetBSD: tape.c,v 1.70 2021/03/11 01:13:11 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1983, 1993 4 * Copyright (c) 1983, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * (c) UNIX System Laboratories, Inc. 6 * (c) UNIX System Laboratories, Inc.
7 * All or some portions of this file are derived from material licensed 7 * All or some portions of this file are derived from material licensed
8 * to the University of California by American Telephone and Telegraph 8 * to the University of California by American Telephone and Telegraph
9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
10 * the permission of UNIX System Laboratories, Inc. 10 * the permission of UNIX System Laboratories, Inc.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE. 34 * SUCH DAMAGE.
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38#ifndef lint 38#ifndef lint
39#if 0 39#if 0
40static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95"; 40static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95";
41#else 41#else
42__RCSID("$NetBSD: tape.c,v 1.69 2020/09/03 19:31:34 bouyer Exp $"); 42__RCSID("$NetBSD: tape.c,v 1.70 2021/03/11 01:13:11 msaitoh Exp $");
43#endif 43#endif
44#endif /* not lint */ 44#endif /* not lint */
45 45
46#include <sys/param.h> 46#include <sys/param.h>
47#include <sys/file.h> 47#include <sys/file.h>
48#include <sys/ioctl.h> 48#include <sys/ioctl.h>
49#include <sys/mtio.h> 49#include <sys/mtio.h>
50#include <sys/stat.h> 50#include <sys/stat.h>
51 51
52#include <ufs/ufs/dinode.h> 52#include <ufs/ufs/dinode.h>
53#include <protocols/dumprestore.h> 53#include <protocols/dumprestore.h>
54 54
55#include <err.h> 55#include <err.h>
@@ -1429,27 +1429,27 @@ skip: @@ -1429,27 +1429,27 @@ skip:
1429 curfile.name = "<file removal list>"; 1429 curfile.name = "<file removal list>";
1430 break; 1430 break;
1431 1431
1432 case TS_BITS: 1432 case TS_BITS:
1433 curfile.name = "<file dump list>"; 1433 curfile.name = "<file dump list>";
1434 break; 1434 break;
1435 1435
1436 case TS_TAPE: 1436 case TS_TAPE:
1437 panic("unexpected tape header\n"); 1437 panic("unexpected tape header\n");
1438 break; 1438 break;
1439 1439
1440 default: 1440 default:
1441 panic("unknown tape header type %d\n", spcl.c_type); 1441 panic("unknown tape header type %d\n", spcl.c_type);
1442 fprintf(stderr, "skiping to next header\n"); 1442 fprintf(stderr, "skipping to next header\n");
1443 goto skip; 1443 goto skip;
1444 1444
1445 } 1445 }
1446 } while (header->c_type == TS_ADDR); 1446 } while (header->c_type == TS_ADDR);
1447 if (skipcnt > 0) 1447 if (skipcnt > 0)
1448 fprintf(stderr, "resync restore, skipped %ld blocks\n", 1448 fprintf(stderr, "resync restore, skipped %ld blocks\n",
1449 (long)skipcnt); 1449 (long)skipcnt);
1450 skipcnt = 0; 1450 skipcnt = 0;
1451} 1451}
1452 1452
1453static int 1453static int
1454checksum(int *buf) 1454checksum(int *buf)
1455{ 1455{