CVS commit: src/usr.bin/seq
Module Name:src
Committed By: cheusov
Date: Sat Mar 20 22:10:17 UTC 2021
Modified Files:
src/usr.bin/seq: seq.c
Log Message:
seq.c: replace non-standard `\e` with standard compliant `\x1B`
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/seq/seq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/seq/seq.c
diff -u src/usr.bin/seq/seq.c:1.11 src/usr.bin/seq/seq.c:1.12
--- src/usr.bin/seq/seq.c:1.11 Mon Dec 17 20:10:51 2018
+++ src/usr.bin/seq/seq.c Sat Mar 20 22:10:17 2021
@@ -31,7 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2005\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: seq.c,v 1.11 2018/12/17 20:10:51 christos Exp $");
+__RCSID("$NetBSD: seq.c,v 1.12 2021/03/20 22:10:17 cheusov Exp $");
#endif /* not lint */
#include
@@ -308,7 +308,7 @@ unescape(char *orig)
*orig = '\b';
continue;
case 'e': /* escape */
- *orig = '\e';
+ *orig = '\x1B';
continue;
case 'f': /* formfeed */
*orig = '\f';
CVS commit: src/usr.bin/cmp
Module Name:src
Committed By: cheusov
Date: Sat Mar 20 14:27:47 UTC 2021
Modified Files:
src/usr.bin/cmp: cmp.c
Log Message:
cmp.c: use C99 strtoll(3) instead of legacy strtoq(3)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/cmp/cmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cmp/cmp.c
diff -u src/usr.bin/cmp/cmp.c:1.20 src/usr.bin/cmp/cmp.c:1.21
--- src/usr.bin/cmp/cmp.c:1.20 Sun Oct 30 19:33:49 2016
+++ src/usr.bin/cmp/cmp.c Sat Mar 20 14:27:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.20 2016/10/30 19:33:49 christos Exp $ */
+/* $NetBSD: cmp.c,v 1.21 2021/03/20 14:27:47 cheusov Exp $ */
/*
* Copyright (c) 1987, 1990, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cmp.c,v 1.20 2016/10/30 19:33:49 christos Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.21 2021/03/20 14:27:47 cheusov Exp $");
#endif
#endif /* not lint */
@@ -125,12 +125,12 @@ main(int argc, char *argv[])
char *ep;
errno = 0;
- skip1 = strtoq(argv[2], &ep, 0);
+ skip1 = (off_t)strtoll(argv[2], &ep, 0);
if (errno || ep == argv[2])
usage();
if (argc == 4) {
- skip2 = strtoq(argv[3], &ep, 0);
+ skip2 = (off_t)strtoll(argv[3], &ep, 0);
if (errno || ep == argv[3])
usage();
}
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 20:02:19 UTC 2021
Modified Files:
src/usr.sbin/mtree: compare.c crc.c extern.h verify.c
Log Message:
mtree: use POSIX type uint32_t instead of u_int32_t
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/mtree/compare.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/mtree/crc.c
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/mtree/extern.h
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/mtree/verify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/compare.c
diff -u src/usr.sbin/mtree/compare.c:1.58 src/usr.sbin/mtree/compare.c:1.59
--- src/usr.sbin/mtree/compare.c:1.58 Thu Nov 21 18:39:50 2013
+++ src/usr.sbin/mtree/compare.c Thu Mar 18 20:02:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: compare.c,v 1.58 2013/11/21 18:39:50 christos Exp $ */
+/* $NetBSD: compare.c,v 1.59 2021/03/18 20:02:18 cheusov Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: compare.c,v 1.58 2013/11/21 18:39:50 christos Exp $");
+__RCSID("$NetBSD: compare.c,v 1.59 2021/03/18 20:02:18 cheusov Exp $");
#endif
#endif /* not lint */
@@ -135,7 +135,7 @@ do { \
int
compare(NODE *s, FTSENT *p)
{
- u_int32_t len, val, flags;
+ uint32_t len, val, flags;
int fd, label;
const char *cp, *tab;
#if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)
Index: src/usr.sbin/mtree/crc.c
diff -u src/usr.sbin/mtree/crc.c:1.9 src/usr.sbin/mtree/crc.c:1.10
--- src/usr.sbin/mtree/crc.c:1.9 Fri Oct 5 00:40:51 2012
+++ src/usr.sbin/mtree/crc.c Thu Mar 18 20:02:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: crc.c,v 1.9 2012/10/05 00:40:51 christos Exp $ */
+/* $NetBSD: crc.c,v 1.10 2021/03/18 20:02:18 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
#else
-__RCSID("$NetBSD: crc.c,v 1.9 2012/10/05 00:40:51 christos Exp $");
+__RCSID("$NetBSD: crc.c,v 1.10 2021/03/18 20:02:18 cheusov Exp $");
#endif
#endif /* not lint */
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: crc.c,v 1.9 2012/10/05
#include "extern.h"
-static const u_int32_t crctab[] = {
+static const uint32_t crctab[] = {
0x0,
0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
@@ -114,15 +114,15 @@ static const u_int32_t crctab[] = {
* locations to store the crc and the number of bytes read. It returns 0 on
* success and 1 on failure. Errno is set on failure.
*/
-u_int32_t crc_total = ~0; /* The crc over a number of files. */
+uint32_t crc_total = ~0; /* The crc over a number of files. */
int
-crc(int fd, u_int32_t *cval, u_int32_t *clen)
+crc(int fd, uint32_t *cval, uint32_t *clen)
{
u_char *p;
int nr;
- u_int32_t thecrc, len;
- u_int32_t crctot;
+ uint32_t thecrc, len;
+ uint32_t crctot;
u_char buf[16 * 1024];
#define COMPUTE(var, ch) (var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)]
Index: src/usr.sbin/mtree/extern.h
diff -u src/usr.sbin/mtree/extern.h:1.39 src/usr.sbin/mtree/extern.h:1.40
--- src/usr.sbin/mtree/extern.h:1.39 Thu Apr 24 17:22:41 2014
+++ src/usr.sbin/mtree/extern.h Thu Mar 18 20:02:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.39 2014/04/24 17:22:41 christos Exp $ */
+/* $NetBSD: extern.h,v 1.40 2021/03/18 20:02:18 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -62,7 +62,7 @@ enum flavor {
void addtag(slist_t *, char *);
int check_excludes(const char *, const char *);
int compare(NODE *, FTSENT *);
-int crc(int, u_int32_t *, u_int32_t *);
+int crc(int, uint32_t *, uint32_t *);
void cwalk(FILE *);
void dump_nodes(FILE *, const char *, NODE *, int);
void init_excludes(void);
@@ -83,7 +83,7 @@ extern int bflag, dflag, eflag, iflag, j
extern int mtree_Mflag, mtree_Sflag, mtree_Wflag;
extern size_t mtree_lineno;
extern enum flavor flavor;
-extern u_int32_t crc_total;
+extern uint32_t crc_total;
extern int ftsoptions, keys;
extern char fullpath[];
extern slist_t includetags, excludetags;
Index: src/usr.sbin/mtree/verify.c
diff -u src/usr.sbin/mtree/verify.c:1.46 src/usr.sbin/mtree/verify.c:1.47
--- src/usr.sbin/mtree/verify.c:1.46 Fri Jan 23 20:28:24 2015
+++ src/usr.sbin/mtree/verify.c Thu Mar 18 20:02:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.c,v 1.46 2015/01/23 20:28:24 christos Exp $ */
+/* $NetBSD: verify.c,v 1.47 2021/03/18 20:02:18 cheusov Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: verify.c,v 1.46 2015/01/23 20:28:24 christos Exp $");
+__RCSID("$NetBSD: verify.c,v 1.47 2021/03/18 20:02:18 cheusov Exp $");
#endif
#endif /* not lint */
@@ -178,7 +178,7 @@ miss(NODE *p, char *tail)
int create;
char *tp;
const char *type
CVS commit: src/usr.bin/join
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 19:47:41 UTC 2021
Modified Files:
src/usr.bin/join: join.c
Log Message:
join.c: print usage after warning "illegal option..." as it was originally
intended
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/join/join.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/join/join.c
diff -u src/usr.bin/join/join.c:1.32 src/usr.bin/join/join.c:1.33
--- src/usr.bin/join/join.c:1.32 Thu Mar 18 19:41:54 2021
+++ src/usr.bin/join/join.c Thu Mar 18 19:47:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: join.c,v 1.32 2021/03/18 19:41:54 cheusov Exp $ */
+/* $NetBSD: join.c,v 1.33 2021/03/18 19:47:41 cheusov Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991\
#if 0
static char sccsid[] = "from: @(#)join.c 5.1 (Berkeley) 11/18/91";
#else
-__RCSID("$NetBSD: join.c,v 1.32 2021/03/18 19:41:54 cheusov Exp $");
+__RCSID("$NetBSD: join.c,v 1.33 2021/03/18 19:47:41 cheusov Exp $");
#endif
#endif /* not lint */
@@ -589,8 +589,9 @@ obsolete(char **argv)
case '\0':
break;
default:
-jbad:errx(1, "illegal option -- %s", ap);
+jbad:warnx("illegal option -- %s", ap);
usage();
+exit(1);
}
break;
case 'o':
CVS commit: src/usr.bin/join
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 19:41:54 UTC 2021
Modified Files:
src/usr.bin/join: join.c
Log Message:
join.c: explicitly convert -1 to u_long in order to fix compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/join/join.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/join/join.c
diff -u src/usr.bin/join/join.c:1.31 src/usr.bin/join/join.c:1.32
--- src/usr.bin/join/join.c:1.31 Sun Sep 4 20:27:52 2011
+++ src/usr.bin/join/join.c Thu Mar 18 19:41:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: join.c,v 1.31 2011/09/04 20:27:52 joerg Exp $ */
+/* $NetBSD: join.c,v 1.32 2021/03/18 19:41:54 cheusov Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991\
#if 0
static char sccsid[] = "from: @(#)join.c 5.1 (Berkeley) 11/18/91";
#else
-__RCSID("$NetBSD: join.c,v 1.31 2011/09/04 20:27:52 joerg Exp $");
+__RCSID("$NetBSD: join.c,v 1.32 2021/03/18 19:41:54 cheusov Exp $");
#endif
#endif /* not lint */
@@ -89,8 +89,8 @@ typedef struct {
u_long setalloc; /* set allocated count */
} INPUT;
-static INPUT input1 = { NULL, 0, 0, 1, NULL, -1, 0, 0, },
- input2 = { NULL, 0, 0, 2, NULL, -1, 0, 0, };
+static INPUT input1 = { NULL, 0, 0, 1, NULL, (u_long)-1, 0, 0, };
+static INPUT input2 = { NULL, 0, 0, 2, NULL, (u_long)-1, 0, 0, };
typedef struct {
u_long fileno; /* file number */
CVS commit: src/usr.bin/ipcs
Module Name:src Committed By: cheusov Date: Thu Mar 18 19:34:05 UTC 2021 Modified Files: src/usr.bin/ipcs: ipcs.c Log Message: ipcs.c: do not #include sys/inttypes.h header which is not necessary To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/usr.bin/ipcs/ipcs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ipcs/ipcs.c diff -u src/usr.bin/ipcs/ipcs.c:1.43 src/usr.bin/ipcs/ipcs.c:1.44 --- src/usr.bin/ipcs/ipcs.c:1.43 Wed Jun 11 14:57:55 2014 +++ src/usr.bin/ipcs/ipcs.c Thu Mar 18 19:34:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ipcs.c,v 1.43 2014/06/11 14:57:55 joerg Exp $ */ +/* $NetBSD: ipcs.c,v 1.44 2021/03/18 19:34:05 cheusov Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include
CVS commit: src/usr.bin/find
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 18:24:14 UTC 2021
Modified Files:
src/usr.bin/find: function.c
Log Message:
find: use POSIX strtoll(3) instead of legacy strtoq(3)
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/find/function.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/find/function.c
diff -u src/usr.bin/find/function.c:1.78 src/usr.bin/find/function.c:1.79
--- src/usr.bin/find/function.c:1.78 Thu Mar 18 18:21:18 2021
+++ src/usr.bin/find/function.c Thu Mar 18 18:24:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: function.c,v 1.78 2021/03/18 18:21:18 cheusov Exp $ */
+/* $NetBSD: function.c,v 1.79 2021/03/18 18:24:14 cheusov Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)function.c 8.10 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: function.c,v 1.78 2021/03/18 18:21:18 cheusov Exp $");
+__RCSID("$NetBSD: function.c,v 1.79 2021/03/18 18:24:14 cheusov Exp $");
#endif
#endif /* not lint */
@@ -181,7 +181,7 @@ find_parsenum(PLAN *plan, const char *op
* and endchar points to the beginning of the string we know we have
* a syntax error.
*/
- value = strtoq(str, &endchar, 10);
+ value = strtoll(str, &endchar, 10);
if (value == 0 && endchar == str)
errx(1, "%s: %s: illegal numeric value", option, vp);
if (endchar[0] && (endch == NULL || endchar[0] != *endch))
CVS commit: src/usr.bin/find
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 18:21:18 UTC 2021
Modified Files:
src/usr.bin/find: find.h function.c
Log Message:
find: use POSIX type uint32_t instead of u_int32_t
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/find/find.h
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/find/function.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/find/find.h
diff -u src/usr.bin/find/find.h:1.26 src/usr.bin/find/find.h:1.27
--- src/usr.bin/find/find.h:1.26 Mon Jun 13 00:04:40 2016
+++ src/usr.bin/find/find.h Thu Mar 18 18:21:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: find.h,v 1.26 2016/06/13 00:04:40 pgoyette Exp $ */
+/* $NetBSD: find.h,v 1.27 2021/03/18 18:21:18 cheusov Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -65,7 +65,7 @@ typedef struct _plandata {
int flags;/* private flags */
enum ntype type; /* plan node type */
union {
- u_int32_t _f_data; /* flags */
+ uint32_t _f_data; /* flags */
gid_t _g_data; /* gid */
ino_t _i_data; /* inode */
mode_t _m_data; /* mode mask */
Index: src/usr.bin/find/function.c
diff -u src/usr.bin/find/function.c:1.77 src/usr.bin/find/function.c:1.78
--- src/usr.bin/find/function.c:1.77 Tue Sep 4 15:16:15 2018
+++ src/usr.bin/find/function.c Thu Mar 18 18:21:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: function.c,v 1.77 2018/09/04 15:16:15 kre Exp $ */
+/* $NetBSD: function.c,v 1.78 2021/03/18 18:21:18 cheusov Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "from: @(#)function.c 8.10 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: function.c,v 1.77 2018/09/04 15:16:15 kre Exp $");
+__RCSID("$NetBSD: function.c,v 1.78 2021/03/18 18:21:18 cheusov Exp $");
#endif
#endif /* not lint */
@@ -960,7 +960,7 @@ c_false(char ***argvp, int isok, char *o
int
f_flags(PLAN *plan, FTSENT *entry)
{
- u_int32_t flags;
+ uint32_t flags;
flags = entry->fts_statp->st_flags;
if (plan->flags == F_ATLEAST)
CVS commit: src/usr.bin/cksum
Module Name:src
Committed By: cheusov
Date: Thu Mar 18 18:12:35 UTC 2021
Modified Files:
src/usr.bin/cksum: cksum.c crc.c crc_extern.h extern.h print.c sum1.c
sum2.c
Log Message:
cksum: use POSIX type uint32_t instead of u_int32_t
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/cksum/cksum.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/cksum/crc.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/cksum/crc_extern.h
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/cksum/extern.h
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/cksum/print.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/cksum/sum1.c src/usr.bin/cksum/sum2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cksum/cksum.c
diff -u src/usr.bin/cksum/cksum.c:1.48 src/usr.bin/cksum/cksum.c:1.49
--- src/usr.bin/cksum/cksum.c:1.48 Tue Jun 16 22:54:10 2015
+++ src/usr.bin/cksum/cksum.c Thu Mar 18 18:12:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: cksum.c,v 1.49 2021/03/18 18:12:35 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.49 2021/03/18 18:12:35 cheusov Exp $");
#endif /* not lint */
#include
@@ -153,12 +153,12 @@ int
main(int argc, char **argv)
{
int ch, fd, rval, pflag, nohashstdin;
- u_int32_t val;
+ uint32_t val;
off_t len;
char *fn;
const char *progname;
- int (*cfncn) (int, u_int32_t *, off_t *);
- void (*pfncn) (char *, u_int32_t, off_t);
+ int (*cfncn) (int, uint32_t *, off_t *);
+ void (*pfncn) (char *, uint32_t, off_t);
const struct hash *hash;
int i, check_warn, do_check;
int print_flags;
@@ -436,7 +436,7 @@ main(int argc, char **argv)
if (cfncn(fd, &val, &len))
ok = 0;
else {
- u_int32_t should_val;
+ uint32_t should_val;
should_val =
strtoul(cksum, NULL, 10);
Index: src/usr.bin/cksum/crc.c
diff -u src/usr.bin/cksum/crc.c:1.21 src/usr.bin/cksum/crc.c:1.22
--- src/usr.bin/cksum/crc.c:1.21 Mon Apr 27 07:30:54 2020
+++ src/usr.bin/cksum/crc.c Thu Mar 18 18:12:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: crc.c,v 1.21 2020/04/27 07:30:54 martin Exp $ */
+/* $NetBSD: crc.c,v 1.22 2021/03/18 18:12:35 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
#else
-__RCSID("$NetBSD: crc.c,v 1.21 2020/04/27 07:30:54 martin Exp $");
+__RCSID("$NetBSD: crc.c,v 1.22 2021/03/18 18:12:35 cheusov Exp $");
#endif
#endif /* not lint */
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: crc.c,v 1.21 2020/04/2
#include "extern.h"
-static const u_int32_t crctab[] = {
+static const uint32_t crctab[] = {
0x0,
0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
@@ -114,10 +114,10 @@ static const u_int32_t crctab[] = {
* success and 1 on failure. Errno is set on failure.
*/
int
-crc(int fd, u_int32_t *cval, off_t *clen)
+crc(int fd, uint32_t *cval, off_t *clen)
{
ssize_t nr;
- u_int32_t thecrc;
+ uint32_t thecrc;
off_t len;
u_char buf[16 * 1024];
Index: src/usr.bin/cksum/crc_extern.h
diff -u src/usr.bin/cksum/crc_extern.h:1.1 src/usr.bin/cksum/crc_extern.h:1.2
--- src/usr.bin/cksum/crc_extern.h:1.1 Mon Sep 4 20:01:10 2006
+++ src/usr.bin/cksum/crc_extern.h Thu Mar 18 18:12:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: crc_extern.h,v 1.1 2006/09/04 20:01:10 dsl Exp $ */
+/* $NetBSD: crc_extern.h,v 1.2 2021/03/18 18:12:35 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -32,7 +32,7 @@
*/
__BEGIN_DECLS
-int crc(int, u_int32_t *, off_t *);
+int crc(int, uint32_t *, off_t *);
uint32_t crc_buf(uint32_t, const void *, size_t);
uint32_t crc_byte(uint32_t, unsigned int);
__END_DECLS
Index: src/usr.bin/cksum/extern.h
diff -u src/usr.bin/cksum/extern.h:1.19 src/usr.bin/cksum/extern.h:1.20
--- src/usr.bin/cksum/extern.h:1.19 Mon Sep 4 20:01:10 2006
+++ src/usr.bin/cksum/extern.h Thu Mar 18 18:12:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.19 2006/09/04 20:01:10 dsl Exp $ */
+/* $NetBSD: extern.h,v 1.20 2021/03/18 18:12:35 cheusov Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,12 +39,12 @@
#include "crc_extern.h"
__BEGIN_DECLS
-void pcrc(char *, u_int32_t, off_t);
-void psum1(char *, u_int32_t, off_t);
-void psum2(char *, u_int32_t, off_t);
-int csum1(int, u_int32_t *, off_t *);
-int csum2(int, u_int32_t *, off_t *);
-int md5(int, u_int32_t *, u_int32_t *);
+void pcrc(char *, uint32_t, off_t);
+void psum1(char *, uint32_t, off_t);
+void psum2(char *, uint32_t, off_t);
+int csum1(int, uint32_t *, off_t *);
+int csum2(int, uint32_t *, off_t *);
+int md5(int, uint32_t *, uint32_t *);
void MD2String(cons
CVS commit: src/bin/pax
Module Name:src
Committed By: cheusov
Date: Wed Apr 24 17:27:08 UTC 2019
Modified Files:
src/bin/pax: pax.c
Log Message:
Fix compilation failure with gcc-8.
Equal pointers to 'struct sigaction' should not be passed to sigaction(2).
So, we pass NULL as an "old sigaction" structure.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/bin/pax/pax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/pax.c
diff -u src/bin/pax/pax.c:1.48 src/bin/pax/pax.c:1.49
--- src/bin/pax/pax.c:1.48 Mon Oct 2 21:55:35 2017
+++ src/bin/pax/pax.c Wed Apr 24 17:27:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.c,v 1.48 2017/10/02 21:55:35 joerg Exp $ */
+/* $NetBSD: pax.c,v 1.49 2019/04/24 17:27:08 cheusov Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: pax.c,v 1.48 2017/10/02 21:55:35 joerg Exp $");
+__RCSID("$NetBSD: pax.c,v 1.49 2019/04/24 17:27:08 cheusov Exp $");
#endif
#endif /* not lint */
@@ -453,28 +453,28 @@ gen_init(void)
if ((sigaction(SIGHUP, &n_hand, &o_hand) < 0) &&
(o_hand.sa_handler == SIG_IGN) &&
- (sigaction(SIGHUP, &o_hand, &o_hand) < 0))
+ (sigaction(SIGHUP, &o_hand, NULL) < 0))
goto out;
if ((sigaction(SIGTERM, &n_hand, &o_hand) < 0) &&
(o_hand.sa_handler == SIG_IGN) &&
- (sigaction(SIGTERM, &o_hand, &o_hand) < 0))
+ (sigaction(SIGTERM, &o_hand, NULL) < 0))
goto out;
if ((sigaction(SIGINT, &n_hand, &o_hand) < 0) &&
(o_hand.sa_handler == SIG_IGN) &&
- (sigaction(SIGINT, &o_hand, &o_hand) < 0))
+ (sigaction(SIGINT, &o_hand, NULL) < 0))
goto out;
if ((sigaction(SIGQUIT, &n_hand, &o_hand) < 0) &&
(o_hand.sa_handler == SIG_IGN) &&
- (sigaction(SIGQUIT, &o_hand, &o_hand) < 0))
+ (sigaction(SIGQUIT, &o_hand, NULL) < 0))
goto out;
#ifdef SIGXCPU
if ((sigaction(SIGXCPU, &n_hand, &o_hand) < 0) &&
(o_hand.sa_handler == SIG_IGN) &&
- (sigaction(SIGXCPU, &o_hand, &o_hand) < 0))
+ (sigaction(SIGXCPU, &o_hand, NULL) < 0))
goto out;
#endif
n_hand.sa_handler = SIG_IGN;
CVS commit: src/usr.bin/csplit
Module Name:src
Committed By: cheusov
Date: Sun Jul 30 23:02:53 UTC 2017
Modified Files:
src/usr.bin/csplit: csplit.c
Log Message:
Compare return value of fputs(3) with EOF instead of 0.
This is POSIX-ly correct and fixes csplit(1) on non-NetBSD systems.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/csplit/csplit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/csplit/csplit.c
diff -u src/usr.bin/csplit/csplit.c:1.6 src/usr.bin/csplit/csplit.c:1.7
--- src/usr.bin/csplit/csplit.c:1.6 Wed Aug 31 13:35:46 2011
+++ src/usr.bin/csplit/csplit.c Sun Jul 30 23:02:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: csplit.c,v 1.6 2011/08/31 13:35:46 joerg Exp $ */
+/* $NetBSD: csplit.c,v 1.7 2017/07/30 23:02:53 cheusov Exp $ */
/* $FreeBSD: src/usr.bin/csplit/csplit.c,v 1.9 2004/03/22 11:15:03 tjr Exp$ */
/*-
@@ -47,7 +47,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: csplit.c,v 1.6 2011/08/31 13:35:46 joerg Exp $");
+__RCSID("$NetBSD: csplit.c,v 1.7 2017/07/30 23:02:53 cheusov Exp $");
#endif
#include
@@ -201,7 +201,7 @@ main(int argc, char *argv[])
/* Copy the rest into a new file. */
if (!feof(infile)) {
ofp = newfile();
- while ((p = get_line()) != NULL && fputs(p, ofp) == 0)
+ while ((p = get_line()) != NULL && fputs(p, ofp) != EOF)
;
if (!sflag)
(void)printf("%jd\n", (intmax_t)ftello(ofp));
@@ -403,7 +403,7 @@ do_rexp(const char *expr)
/* Read and output lines until we get a match. */
first = 1;
while ((p = get_line()) != NULL) {
- if (fputs(p, ofp) != 0)
+ if (fputs(p, ofp) == EOF)
break;
if (!first && regexec(&cre, p, 0, NULL, 0) == 0)
break;
@@ -429,7 +429,7 @@ do_rexp(const char *expr)
* after the match.
*/
while (--ofs > 0 && (p = get_line()) != NULL)
- if (fputs(p, ofp) != 0)
+ if (fputs(p, ofp) == EOF)
break;
toomuch(NULL, 0L);
nwritten = (intmax_t)ftello(ofp);
@@ -465,7 +465,7 @@ do_lineno(const char *expr)
while (lineno + 1 != lastline) {
if ((p = get_line()) == NULL)
errx(1, "%ld: out of range", lastline);
- if (fputs(p, ofp) != 0)
+ if (fputs(p, ofp) == EOF)
break;
}
if (!sflag)
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: cheusov Date: Sun Jul 30 22:53:56 UTC 2017 Modified Files: src/lib/libc/stdio: fputs.3 Log Message: According to POSIX return value of fputs(3) should be a non-netagive value if it succeeds To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdio/fputs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/fputs.3 diff -u src/lib/libc/stdio/fputs.3:1.12 src/lib/libc/stdio/fputs.3:1.13 --- src/lib/libc/stdio/fputs.3:1.12 Wed Feb 22 14:58:33 2017 +++ src/lib/libc/stdio/fputs.3 Sun Jul 30 22:53:56 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: fputs.3,v 1.12 2017/02/22 14:58:33 abhinav Exp $ +.\" $NetBSD: fputs.3,v 1.13 2017/07/30 22:53:56 cheusov Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -67,14 +67,11 @@ and a terminating newline character, to the stream .Em stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts -returns a nonnegative integer on success and +return a nonnegative integer on success and .Dv EOF on error. .Sh ERRORS
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: cheusov
Date: Sun Mar 24 23:00:49 UTC 2013
Modified Files:
src/sys/dev/usb: uftdi.c usbdevs usbdevs.h usbdevs_data.h
Log Message:
New device Id for Beagle Bone, reviewed by bouyer@ and Lloyd Parker
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.639 -r1.640 src/sys/dev/usb/usbdevs
cvs rdiff -u -r1.632 -r1.633 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.633 -r1.634 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.56 src/sys/dev/usb/uftdi.c:1.57
--- src/sys/dev/usb/uftdi.c:1.56 Mon Jan 21 19:08:42 2013
+++ src/sys/dev/usb/uftdi.c Sun Mar 24 23:00:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv Exp $ */
+/* $NetBSD: uftdi.c,v 1.57 2013/03/24 23:00:48 cheusov Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.57 2013/03/24 23:00:48 cheusov Exp $");
#include
#include
@@ -153,6 +153,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_635 },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_OPENRD_JTAGKEY },
+ { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_BEAGLEBONE },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MAXSTREAM_PKG_U },
{ USB_VENDOR_xxFTDI, USB_PRODUCT_xxFTDI_SHEEVAPLUG_JTAG },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN },
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.639 src/sys/dev/usb/usbdevs:1.640
--- src/sys/dev/usb/usbdevs:1.639 Wed Mar 20 15:33:24 2013
+++ src/sys/dev/usb/usbdevs Sun Mar 24 23:00:48 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.639 2013/03/20 15:33:24 garbled Exp $
+$NetBSD: usbdevs,v 1.640 2013/03/24 23:00:48 cheusov Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1470,6 +1470,7 @@ product FTDI SERIAL_232H0x6014 C
product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse
product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial converter
product FTDI OPENRD_JTAGKEY 0x9e90 OpenRD JTAGKey FT2232D B
+product FTDI BEAGLEBONE 0xa6d0 BeagleBone
product FTDI MAXSTREAM_PKG_U 0xee18 MaxStream PKG-U
product FTDI MHAM_KW 0xeee8 KW
product FTDI MHAM_YS 0xeee9 YS
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.632 src/sys/dev/usb/usbdevs.h:1.633
--- src/sys/dev/usb/usbdevs.h:1.632 Wed Mar 20 15:38:34 2013
+++ src/sys/dev/usb/usbdevs.h Sun Mar 24 23:00:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.632 2013/03/20 15:38:34 garbled Exp $ */
+/* $NetBSD: usbdevs.h,v 1.633 2013/03/24 23:00:48 cheusov Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1477,6 +1477,7 @@
#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */
#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */
#define USB_PRODUCT_FTDI_OPENRD_JTAGKEY 0x9e90 /* OpenRD JTAGKey FT2232D B */
+#define USB_PRODUCT_FTDI_BEAGLEBONE 0xa6d0 /* BeagleBone */
#define USB_PRODUCT_FTDI_MAXSTREAM_PKG_U 0xee18 /* MaxStream PKG-U */
#define USB_PRODUCT_FTDI_MHAM_KW 0xeee8 /* KW */
#define USB_PRODUCT_FTDI_MHAM_YS 0xeee9 /* YS */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.633 src/sys/dev/usb/usbdevs_data.h:1.634
--- src/sys/dev/usb/usbdevs_data.h:1.633 Wed Mar 20 15:38:34 2013
+++ src/sys/dev/usb/usbdevs_data.h Sun Mar 24 23:00:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.633 2013/03/20 15:38:34 garbled Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.634 2013/03/24 23:00:48 cheusov Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -4671,6 +4671,10 @@ const struct usb_product usb_products[]
"OpenRD JTAGKey FT2232D B",
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_BEAGLEBONE,
+ "BeagleBone",
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MAXSTREAM_PKG_U,
"MaxStream PKG-U",
},
@@ -9875,4 +9879,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1939;
+const int usb_nproducts = 1940;
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc Committed By: cheusov Date: Thu Oct 11 08:02:10 UTC 2012 Modified Files: othersrc/usr.sbin/pkg_setup: pkg_setup Log Message: Clean-ups in usage message To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 othersrc/usr.sbin/pkg_setup/pkg_setup Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.sbin/pkg_setup/pkg_setup diff -u othersrc/usr.sbin/pkg_setup/pkg_setup:1.5 othersrc/usr.sbin/pkg_setup/pkg_setup:1.6 --- othersrc/usr.sbin/pkg_setup/pkg_setup:1.5 Thu Oct 11 07:59:02 2012 +++ othersrc/usr.sbin/pkg_setup/pkg_setup Thu Oct 11 08:02:10 2012 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_setup,v 1.5 2012/10/11 07:59:02 cheusov Exp $ +# $NetBSD: pkg_setup,v 1.6 2012/10/11 08:02:10 cheusov Exp $ # # Copyright (c) 2011 Aleksey Cheusov # @@ -53,7 +53,7 @@ Examples: pkg_setup -v -d http://example.org/pkgsrc/linux/repo -p nih - env FTP_CMD='ftp -4V' ./pkg_setup -v \ + env FTP_CMD='ftp -4V' ./pkg_setup -v \ -d http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/5.0 -- -P /tmp EOF }
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc
Committed By: cheusov
Date: Thu Oct 11 07:59:02 UTC 2012
Modified Files:
othersrc/usr.sbin/pkg_setup: pkg_setup
Log Message:
Fix in OSVER initialization
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.sbin/pkg_setup/pkg_setup
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.sbin/pkg_setup/pkg_setup
diff -u othersrc/usr.sbin/pkg_setup/pkg_setup:1.4 othersrc/usr.sbin/pkg_setup/pkg_setup:1.5
--- othersrc/usr.sbin/pkg_setup/pkg_setup:1.4 Thu Sep 13 20:09:03 2012
+++ othersrc/usr.sbin/pkg_setup/pkg_setup Thu Oct 11 07:59:02 2012
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_setup,v 1.4 2012/09/13 20:09:03 cheusov Exp $
+# $NetBSD: pkg_setup,v 1.5 2012/10/11 07:59:02 cheusov Exp $
#
# Copyright (c) 2011 Aleksey Cheusov
#
@@ -27,7 +27,7 @@
# Variables changable by user
: ${OPSYS:=`uname -s`}
-: ${OSVER:=`uname -r | sed 's/[_-]*$//'`}
+: ${OSVER:=`uname -r | sed 's/[_-].*$//'`}
: ${ARCH:=`uname -m`}
: ${MIRROR:='http://ftp.NetBSD.org'}
: ${URL:="$MIRROR/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER"}
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc
Committed By: cheusov
Date: Thu Sep 13 20:09:04 UTC 2012
Modified Files:
othersrc/usr.sbin/pkg_setup: pkg_setup
Log Message:
Support for file:// protocol in URL
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.sbin/pkg_setup/pkg_setup
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.sbin/pkg_setup/pkg_setup
diff -u othersrc/usr.sbin/pkg_setup/pkg_setup:1.3 othersrc/usr.sbin/pkg_setup/pkg_setup:1.4
--- othersrc/usr.sbin/pkg_setup/pkg_setup:1.3 Mon Nov 14 11:12:37 2011
+++ othersrc/usr.sbin/pkg_setup/pkg_setup Thu Sep 13 20:09:03 2012
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_setup,v 1.3 2011/11/14 11:12:37 cheusov Exp $
+# $NetBSD: pkg_setup,v 1.4 2012/09/13 20:09:03 cheusov Exp $
#
# Copyright (c) 2011 Aleksey Cheusov
#
@@ -64,6 +64,16 @@ vecho (){
fi
}
+download (){
+# $1 - URL
+file=`echo "$1" | sed -n 's,file://,,p'`
+if test -z "$file"; then
+ $FTP_CMD "$1"
+else
+ cp "$file" .
+fi
+}
+
while getopts hvd:p: f; do
case $f in
h)
@@ -88,7 +98,7 @@ test -n "$tmpdir" || exit 1
cd "$tmpdir"
vecho 'Downloading pkg_summary.gz...'
-$FTP_CMD "$URL/All/pkg_summary.gz"
+download "$URL/All/pkg_summary.gz"
pkgname=`gzip -dc pkg_summary.gz | awk -F= '/^PKGNAME=pkg_install-[0-9]/ {print $2; exit}'`
if test -z "$pkgname"; then
echo 'Cannot find package pkg_install in pkg_summary(5)' 1>&2
@@ -96,7 +106,7 @@ if test -z "$pkgname"; then
fi
vecho "Downloading $pkgname.tgz..."
-$FTP_CMD "$URL/All/$pkgname.tgz"
+download "$URL/All/$pkgname.tgz"
gzip -dc "$pkgname.tgz" | tar -xf -
vecho "Installing pkg_install..."
CVS commit: src/share/man/man9
Module Name:src Committed By: cheusov Date: Tue Jul 3 21:35:05 UTC 2012 Modified Files: src/share/man/man9: kauth.9 Log Message: Fix documentation for function kauth_register_key (PR 46641). To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/man/man9/kauth.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/kauth.9 diff -u src/share/man/man9/kauth.9:1.102 src/share/man/man9/kauth.9:1.103 --- src/share/man/man9/kauth.9:1.102 Wed Jun 27 20:29:38 2012 +++ src/share/man/man9/kauth.9 Tue Jul 3 21:35:04 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: kauth.9,v 1.102 2012/06/27 20:29:38 wiz Exp $ +.\" $NetBSD: kauth.9,v 1.103 2012/07/03 21:35:04 cheusov Exp $ .\" .\" Copyright (c) 2005, 2006 Elad Efrat .\" All rights reserved. @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 27, 2012 +.Dd July 4, 2012 .Dt KAUTH 9 .Os .Sh NAME @@ -1705,10 +1705,9 @@ may be associated with the credentials. Registering, and deregistering, a key is done by using these routines: .Pp .Bl -tag -width compact -.It Ft int Fn kauth_register_key "const char *name" "kauth_key_t *keyp" -Register new key for private data for -.Ar name -(usually, the security model name). +.It Ft int Fn kauth_register_key "secmodel_t sm" "kauth_key_t *keyp" +Register new key for private data for security model +.Ar sm . .Ar keyp will be used to return the key to be used in further calls. .Pp
CVS commit: src
Module Name:src
Committed By: cheusov
Date: Wed Jun 27 12:28:29 UTC 2012
Modified Files:
src/share/man/man9: kauth.9
src/sys/kern: kern_auth.c vfs_syscalls.c
src/sys/sys: kauth.h
Log Message:
Add new action KAUTH_CRED_CHROOT for kauth(9)'s credential scope.
Reviewed and approved by elad@.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/share/man/man9/kauth.9
cvs rdiff -u -r1.70 -r1.71 src/sys/kern/kern_auth.c
cvs rdiff -u -r1.456 -r1.457 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.69 -r1.70 src/sys/sys/kauth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/kauth.9
diff -u src/share/man/man9/kauth.9:1.100 src/share/man/man9/kauth.9:1.101
--- src/share/man/man9/kauth.9:1.100 Sat Mar 17 14:42:13 2012
+++ src/share/man/man9/kauth.9 Wed Jun 27 12:28:28 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: kauth.9,v 1.100 2012/03/17 14:42:13 njoly Exp $
+.\" $NetBSD: kauth.9,v 1.101 2012/06/27 12:28:28 cheusov Exp $
.\"
.\" Copyright (c) 2005, 2006 Elad Efrat
.\" All rights reserved.
@@ -1534,6 +1534,15 @@ and
are both
.Ft struct proc *
of the parent and child processes, respectively.
+.It Dv KAUTH_CRED_CHROOT
+The credentials in cred belong to a process whose root directory is
+changed through
+.Xr change_root 9
+.Pp
+.Ar Arg0
+is the new
+.Ft struct cwdinfo *
+of the process.
.It Dv KAUTH_CRED_FREE
The credentials in
.Ar cred
Index: src/sys/kern/kern_auth.c
diff -u src/sys/kern/kern_auth.c:1.70 src/sys/kern/kern_auth.c:1.71
--- src/sys/kern/kern_auth.c:1.70 Wed Jun 27 10:06:55 2012
+++ src/sys/kern/kern_auth.c Wed Jun 27 12:28:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_auth.c,v 1.70 2012/06/27 10:06:55 cheusov Exp $ */
+/* $NetBSD: kern_auth.c,v 1.71 2012/06/27 12:28:28 cheusov Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.70 2012/06/27 10:06:55 cheusov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.71 2012/06/27 12:28:28 cheusov Exp $");
#include
#include
@@ -260,6 +260,12 @@ kauth_proc_fork(struct proc *parent, str
child);
}
+void
+kauth_proc_chroot(kauth_cred_t cred, struct cwdinfo *cwdi)
+{
+ kauth_cred_hook(cred, KAUTH_CRED_CHROOT, cwdi, NULL);
+}
+
uid_t
kauth_cred_getuid(kauth_cred_t cred)
{
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.456 src/sys/kern/vfs_syscalls.c:1.457
--- src/sys/kern/vfs_syscalls.c:1.456 Tue May 8 08:44:49 2012
+++ src/sys/kern/vfs_syscalls.c Wed Jun 27 12:28:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.456 2012/05/08 08:44:49 gson Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.457 2012/06/27 12:28:28 cheusov Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.456 2012/05/08 08:44:49 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.457 2012/06/27 12:28:28 cheusov Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1398,6 +1398,10 @@ sys_chroot(struct lwp *l, const struct s
void
change_root(struct cwdinfo *cwdi, struct vnode *vp, struct lwp *l)
{
+ struct proc *p = l->l_proc;
+ kauth_cred_t ncred;
+
+ ncred = kauth_cred_alloc();
rw_enter(&cwdi->cwdi_lock, RW_WRITER);
if (cwdi->cwdi_rdir != NULL)
@@ -1419,6 +1423,15 @@ change_root(struct cwdinfo *cwdi, struct
cwdi->cwdi_cdir = vp;
}
rw_exit(&cwdi->cwdi_lock);
+
+ /* Get a write lock on the process credential. */
+ proc_crmod_enter();
+
+ kauth_cred_clone(p->p_cred, ncred);
+ kauth_proc_chroot(ncred, p->p_cwdi);
+
+ /* Broadcast our credentials to the process and other LWPs. */
+ proc_crmod_leave(ncred, p->p_cred, true);
}
/*
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.69 src/sys/sys/kauth.h:1.70
--- src/sys/sys/kauth.h:1.69 Tue Mar 13 18:41:02 2012
+++ src/sys/sys/kauth.h Wed Jun 27 12:28:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.69 2012/03/13 18:41:02 elad Exp $ */
+/* $NetBSD: kauth.h,v 1.70 2012/06/27 12:28:28 cheusov Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -44,6 +44,7 @@ struct ki_pcred;
struct proc;
struct tty;
struct vnode;
+struct cwdinfo;
enum vtype;
/* Types. */
@@ -331,7 +332,8 @@ enum {
KAUTH_CRED_INIT=1,
KAUTH_CRED_FORK,
KAUTH_CRED_COPY,
- KAUTH_CRED_FREE
+ KAUTH_CRED_FREE,
+ KAUTH_CRED_CHROOT
};
/*
@@ -487,4 +489,6 @@ kauth_action_t kauth_extattr_action(mode
kauth_cred_t kauth_cred_get(void);
void kauth_proc_fork(struct proc *, struct proc *);
+void kauth_proc_chroot(kauth_cred_t cred, struct cwdinfo *cwdi);
+
#endif /* !_SYS_KAUTH_H_ */
CVS commit: src/sys/secmodel/securelevel
Module Name:src
Committed By: cheusov
Date: Wed Jun 27 10:15:25 UTC 2012
Modified Files:
src/sys/secmodel/securelevel: secmodel_securelevel.c
Log Message:
KNF fix. spaces vs. tab
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.27 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.28
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.27 Tue Mar 13 18:41:02 2012
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c Wed Jun 27 10:15:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.27 2012/03/13 18:41:02 elad Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.28 2012/06/27 10:15:25 cheusov Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.27 2012/03/13 18:41:02 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.28 2012/06/27 10:15:25 cheusov Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -473,11 +473,11 @@ int
secmodel_securelevel_machdep_cb(kauth_cred_t cred, kauth_action_t action,
void *cookie, void *arg0, void *arg1, void *arg2, void *arg3)
{
-int result;
+ int result;
-result = KAUTH_RESULT_DEFER;
+ result = KAUTH_RESULT_DEFER;
-switch (action) {
+ switch (action) {
case KAUTH_MACHDEP_IOPERM_SET:
case KAUTH_MACHDEP_IOPL:
if (securelevel > 0)
CVS commit: src/sys/kern
Module Name:src Committed By: cheusov Date: Wed Jun 27 10:06:55 UTC 2012 Modified Files: src/sys/kern: kern_auth.c Log Message: KNF fix. space vs. tab To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/kern/kern_auth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_auth.c diff -u src/sys/kern/kern_auth.c:1.69 src/sys/kern/kern_auth.c:1.70 --- src/sys/kern/kern_auth.c:1.69 Wed Jun 27 10:02:02 2012 +++ src/sys/kern/kern_auth.c Wed Jun 27 10:06:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_auth.c,v 1.69 2012/06/27 10:02:02 cheusov Exp $ */ +/* $NetBSD: kern_auth.c,v 1.70 2012/06/27 10:06:55 cheusov Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.69 2012/06/27 10:02:02 cheusov Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.70 2012/06/27 10:06:55 cheusov Exp $"); #include #include @@ -156,7 +156,7 @@ kauth_cred_hold(kauth_cred_t cred) KASSERT(cred != NULL); KASSERT(cred->cr_refcnt > 0); -atomic_inc_uint(&cred->cr_refcnt); + atomic_inc_uint(&cred->cr_refcnt); } /* Decrease reference count to cred. If reached zero, free it. */
CVS commit: src/sys/kern
Module Name:src
Committed By: cheusov
Date: Wed Jun 27 10:02:02 UTC 2012
Modified Files:
src/sys/kern: kern_auth.c
Log Message:
Fix a typo. s/seperate/separate/
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/kern/kern_auth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_auth.c
diff -u src/sys/kern/kern_auth.c:1.68 src/sys/kern/kern_auth.c:1.69
--- src/sys/kern/kern_auth.c:1.68 Tue Mar 13 18:40:52 2012
+++ src/sys/kern/kern_auth.c Wed Jun 27 10:02:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_auth.c,v 1.68 2012/03/13 18:40:52 elad Exp $ */
+/* $NetBSD: kern_auth.c,v 1.69 2012/06/27 10:02:02 cheusov Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.68 2012/03/13 18:40:52 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_auth.c,v 1.69 2012/06/27 10:02:02 cheusov Exp $");
#include
#include
@@ -66,7 +66,7 @@ struct kauth_cred {
* Ensure that the first part of the credential resides in its own
* cache line. Due to sharing there aren't many kauth_creds in a
* typical system, but the reference counts change very often.
- * Keeping it seperate from the rest of the data prevents false
+ * Keeping it separate from the rest of the data prevents false
* sharing between CPUs.
*/
u_int cr_refcnt; /* reference count */
CVS commit: xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc Committed By: cheusov Date: Sat May 19 05:16:27 UTC 2012 Modified Files: xsrc/external/mit/libXfont/dist/src/bitmap: pcfread.c Log Message: fix in libxfont: An uninitialized pointer causes a crash if pcf header is corrupted (upstream patch). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c diff -u xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.2 --- xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 Wed Jun 10 07:33:40 2009 +++ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Sat May 19 05:16:27 2012 @@ -408,6 +408,8 @@ pcfReadFont(FontPtr pFont, FontFilePtr f pFont->info.nprops = 0; pFont->info.props = 0; +pFont->info.isStringProp=0; + if (!(tables = pcfReadTOC(file, &ntables))) goto Bail;
CVS commit: src/external/gpl2/lvm2
Module Name:src
Committed By: cheusov
Date: Wed May 2 13:35:04 UTC 2012
Modified Files:
src/external/gpl2/lvm2/lib/liblvm: Makefile
src/external/gpl2/lvm2/sbin/lvm: Makefile
Log Message:
Add .include for initializing USE_SSP.
This fixes build failure if USE_FORT=YES
Approved by christos@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/lvm2/lib/liblvm/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/lvm2/sbin/lvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.6
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.5 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Wed May 2 13:35:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/05/26 12:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/05/02 13:35:03 cheusov Exp $
LIBISPRIVATE= yes
@@ -14,6 +14,9 @@ CWARNFLAGS+= -Wno-parentheses
CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
-I.
+.include
+.include # for USE_SSP
+
# Some parts of liblvm can't be protected because if its
# alloca() usage.
#
Index: src/external/gpl2/lvm2/sbin/lvm/Makefile
diff -u src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10 src/external/gpl2/lvm2/sbin/lvm/Makefile:1.11
--- src/external/gpl2/lvm2/sbin/lvm/Makefile:1.10 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/sbin/lvm/Makefile Wed May 2 13:35:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/05/26 12:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/05/02 13:35:04 cheusov Exp $
USE_FORT?= no
NOLINT= #defined
@@ -30,6 +30,9 @@ CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM
CPPFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\"
+.include
+.include # for USE_SSP
+
# Some parts of the code can't be protected because if its
# alloca() usage.
#
CVS commit: src
Module Name:src
Committed By: cheusov
Date: Tue Nov 22 20:22:10 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/util/awk: Makefile t_awk.sh
Added Files:
src/tests/util/awk: d_assign_NF.awk d_assign_NF.in d_assign_NF.out
Log Message:
Regression tests for awk(1) (PR 44063)
To generate a diff of this commit:
cvs rdiff -u -r1.425 -r1.426 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/util/awk/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/awk/d_assign_NF.awk \
src/tests/util/awk/d_assign_NF.in src/tests/util/awk/d_assign_NF.out
cvs rdiff -u -r1.6 -r1.7 src/tests/util/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.425 src/distrib/sets/lists/tests/mi:1.426
--- src/distrib/sets/lists/tests/mi:1.425 Mon Nov 21 23:50:44 2011
+++ src/distrib/sets/lists/tests/mi Tue Nov 22 20:22:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.425 2011/11/21 23:50:44 joerg Exp $
+# $NetBSD: mi,v 1.426 2011/11/22 20:22:09 cheusov Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2713,6 +2713,9 @@
./usr/tests/util/Atffile tests-util-tests
./usr/tests/util/awktests-util-tests
./usr/tests/util/awk/Atffile tests-util-tests
+./usr/tests/util/awk/d_assign_NF.awk tests-util-tests
+./usr/tests/util/awk/d_assign_NF.in tests-util-tests
+./usr/tests/util/awk/d_assign_NF.out tests-util-tests
./usr/tests/util/awk/d_big_regexp.awk tests-util-tests
./usr/tests/util/awk/d_big_regexp.in tests-util-tests
./usr/tests/util/awk/d_big_regexp.out tests-util-tests
Index: src/tests/util/awk/Makefile
diff -u src/tests/util/awk/Makefile:1.2 src/tests/util/awk/Makefile:1.3
--- src/tests/util/awk/Makefile:1.2 Sat Apr 30 11:24:14 2011
+++ src/tests/util/awk/Makefile Tue Nov 22 20:22:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/30 11:24:14 alnsn Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/22 20:22:10 cheusov Exp $
NOMAN= # defined
@@ -29,5 +29,8 @@ FILES+= d_tolower.out
FILES+= d_toupper.awk
FILES+= d_toupper.in
FILES+= d_toupper.out
+FILES+= d_assign_NF.awk
+FILES+= d_assign_NF.in
+FILES+= d_assign_NF.out
.include
Index: src/tests/util/awk/t_awk.sh
diff -u src/tests/util/awk/t_awk.sh:1.6 src/tests/util/awk/t_awk.sh:1.7
--- src/tests/util/awk/t_awk.sh:1.6 Mon May 2 08:30:21 2011
+++ src/tests/util/awk/t_awk.sh Tue Nov 22 20:22:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.6 2011/05/02 08:30:21 jruoho Exp $
+# $NetBSD: t_awk.sh,v 1.7 2011/11/22 20:22:10 cheusov Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -98,6 +98,16 @@ period_body()
h_check period -v x=0.5
}
+atf_test_case assign_NF
+assign_NF_head()
+{
+ atf_set "descr" 'Checks that assign to NF changes $0 and $n (PR/44063)'
+}
+assign_NF_body()
+{
+ h_check assign_NF
+}
+
atf_init_test_cases()
{
atf_add_test_case big_regexp
@@ -105,4 +115,5 @@ atf_init_test_cases()
atf_add_test_case string1
atf_add_test_case multibyte
atf_add_test_case period
+ atf_add_test_case assign_NF
}
Added files:
Index: src/tests/util/awk/d_assign_NF.awk
diff -u /dev/null src/tests/util/awk/d_assign_NF.awk:1.1
--- /dev/null Tue Nov 22 20:22:10 2011
+++ src/tests/util/awk/d_assign_NF.awk Tue Nov 22 20:22:10 2011
@@ -0,0 +1,16 @@
+# $NetBSD: d_assign_NF.awk,v 1.1 2011/11/22 20:22:10 cheusov Exp $
+
+{
+ NF = 2
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+ NF = 3
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+ NF = 4
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+}
Index: src/tests/util/awk/d_assign_NF.in
diff -u /dev/null src/tests/util/awk/d_assign_NF.in:1.1
--- /dev/null Tue Nov 22 20:22:10 2011
+++ src/tests/util/awk/d_assign_NF.in Tue Nov 22 20:22:10 2011
@@ -0,0 +1 @@
+ 12 3
Index: src/tests/util/awk/d_assign_NF.out
diff -u /dev/null src/tests/util/awk/d_assign_NF.out:1.1
--- /dev/null Tue Nov 22 20:22:10 2011
+++ src/tests/util/awk/d_assign_NF.out Tue Nov 22 20:22:10 2011
@@ -0,0 +1,9 @@
+$0=`1 2`
+$3=``
+$4=``
+$0=`1 2 `
+$3=``
+$4=``
+$0=`1 2 `
+$3=``
+$4=``
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc
Committed By: cheusov
Date: Mon Nov 14 11:12:38 UTC 2011
Modified Files:
othersrc/usr.sbin/pkg_setup: pkg_setup
Log Message:
Add option '-p ' for installing specified packages in addition to
pkg_install.
Example: pkg_setup -v -d http://example.org/pkgsrc/linux/repo -p nih
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.sbin/pkg_setup/pkg_setup
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.sbin/pkg_setup/pkg_setup
diff -u othersrc/usr.sbin/pkg_setup/pkg_setup:1.2 othersrc/usr.sbin/pkg_setup/pkg_setup:1.3
--- othersrc/usr.sbin/pkg_setup/pkg_setup:1.2 Sun Nov 6 17:53:52 2011
+++ othersrc/usr.sbin/pkg_setup/pkg_setup Mon Nov 14 11:12:37 2011
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_setup,v 1.2 2011/11/06 17:53:52 cheusov Exp $
+# $NetBSD: pkg_setup,v 1.3 2011/11/14 11:12:37 cheusov Exp $
#
# Copyright (c) 2011 Aleksey Cheusov
#
@@ -42,10 +42,19 @@ ${0##*/} downloads pkg_install binary pa
usage: ${0##*/} [options] [-- [pkg_add options]]
options:
- -h display this screen
- -v verbose output
- -d url to binary repository, the default is
- http://ftp.netbsd.org/pub/pkgsrc/packages/\$OPSYS/\$ARCH/\$OSVER
+ -hdisplay this screen
+ -vverbose output
+ -d url to binary repository, the default is
+http://ftp.netbsd.org/pub/pkgsrc/packages/\$OPSYS/\$ARCH/\$OSVER
+ -p install specified packages in addition to pkg_install
+
+Examples:
+ pkg_setup
+
+ pkg_setup -v -d http://example.org/pkgsrc/linux/repo -p nih
+
+ env FTP_CMD='ftp -4V' ./pkg_setup -v \
+ -d http://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/5.0 -- -P /tmp
EOF
}
@@ -55,7 +64,7 @@ vecho (){
fi
}
-while getopts hvd: f; do
+while getopts hvd:p: f; do
case $f in
h)
usage
@@ -64,6 +73,8 @@ while getopts hvd: f; do
verbose=1;;
d)
URL="$OPTARG";;
+ p)
+ packages="$OPTARG";;
\?)
exit 1;;
esac
@@ -88,7 +99,14 @@ vecho "Downloading $pkgname.tgz..."
$FTP_CMD "$URL/All/$pkgname.tgz"
gzip -dc "$pkgname.tgz" | tar -xf -
-vecho "Installing..."
+vecho "Installing pkg_install..."
./sbin/pkg_add "$@" ./"$pkgname.tgz"
+if test -n "$packages"; then
+vecho "Installing $packages..."
+PKG_PATH="$URL/All"
+export PKG_PATH
+./sbin/pkg_add "$@" $packages
+fi
+
vecho "done"
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc
Committed By: cheusov
Date: Sun Nov 6 17:53:52 UTC 2011
Modified Files:
othersrc/usr.sbin/pkg_setup: pkg_setup
Log Message:
Use ${0##*/} and http:// instead of ftp:// as suggested by Jean-Yves Migeon
Fix bug in vecho
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.sbin/pkg_setup/pkg_setup
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.sbin/pkg_setup/pkg_setup
diff -u othersrc/usr.sbin/pkg_setup/pkg_setup:1.1 othersrc/usr.sbin/pkg_setup/pkg_setup:1.2
--- othersrc/usr.sbin/pkg_setup/pkg_setup:1.1 Sun Nov 6 11:36:31 2011
+++ othersrc/usr.sbin/pkg_setup/pkg_setup Sun Nov 6 17:53:52 2011
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: pkg_setup,v 1.1 2011/11/06 11:36:31 cheusov Exp $
+# $NetBSD: pkg_setup,v 1.2 2011/11/06 17:53:52 cheusov Exp $
#
# Copyright (c) 2011 Aleksey Cheusov
#
@@ -29,28 +29,30 @@
: ${OPSYS:=`uname -s`}
: ${OSVER:=`uname -r | sed 's/[_-]*$//'`}
: ${ARCH:=`uname -m`}
-: ${MIRROR:='ftp://ftp.NetBSD.org'}
-: ${FTPDIR:="$MIRROR/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER"}
+: ${MIRROR:='http://ftp.NetBSD.org'}
+: ${URL:="$MIRROR/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER"}
: ${FTP_CMD:=ftp -V}
##
set -e
usage (){
-cat <<'EOF'
-pkg_setup downloads pkg_install binary package and installs it.
-usage: pkg_setup [options] [-- [pkg_add options]]
+cat <ftp://ftp.netbsd.org/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER
+ http://ftp.netbsd.org/pub/pkgsrc/packages/\$OPSYS/\$ARCH/\$OSVER
EOF
}
vecho (){
-test -n "$verbose" && echo "$@"
+if test -n "$verbose"; then
+ echo "$@"
+fi
}
while getopts hvd: f; do
@@ -61,7 +63,7 @@ while getopts hvd: f; do
v)
verbose=1;;
d)
- FTPDIR="$OPTARG";;
+ URL="$OPTARG";;
\?)
exit 1;;
esac
@@ -75,7 +77,7 @@ test -n "$tmpdir" || exit 1
cd "$tmpdir"
vecho 'Downloading pkg_summary.gz...'
-$FTP_CMD "$FTPDIR/All/pkg_summary.gz"
+$FTP_CMD "$URL/All/pkg_summary.gz"
pkgname=`gzip -dc pkg_summary.gz | awk -F= '/^PKGNAME=pkg_install-[0-9]/ {print $2; exit}'`
if test -z "$pkgname"; then
echo 'Cannot find package pkg_install in pkg_summary(5)' 1>&2
@@ -83,7 +85,7 @@ if test -z "$pkgname"; then
fi
vecho "Downloading $pkgname.tgz..."
-$FTP_CMD "$FTPDIR/All/$pkgname.tgz"
+$FTP_CMD "$URL/All/$pkgname.tgz"
gzip -dc "$pkgname.tgz" | tar -xf -
vecho "Installing..."
CVS commit: othersrc/usr.sbin/pkg_setup
Module Name:othersrc
Committed By: cheusov
Date: Sun Nov 6 11:36:31 UTC 2011
Added Files:
othersrc/usr.sbin/pkg_setup: Makefile pkg_setup
Log Message:
pkg_setup is a replacement for pkg_install in base system.
It downloads pkg_install package from binary repository and installs it
creating pkgdb.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/usr.sbin/pkg_setup/Makefile \
othersrc/usr.sbin/pkg_setup/pkg_setup
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: othersrc/usr.sbin/pkg_setup/Makefile
diff -u /dev/null othersrc/usr.sbin/pkg_setup/Makefile:1.1
--- /dev/null Sun Nov 6 11:36:31 2011
+++ othersrc/usr.sbin/pkg_setup/Makefile Sun Nov 6 11:36:31 2011
@@ -0,0 +1,5 @@
+SCRIPTS= pkg_setup
+
+#MAN= pkg_setup.8
+
+.include
Index: othersrc/usr.sbin/pkg_setup/pkg_setup
diff -u /dev/null othersrc/usr.sbin/pkg_setup/pkg_setup:1.1
--- /dev/null Sun Nov 6 11:36:31 2011
+++ othersrc/usr.sbin/pkg_setup/pkg_setup Sun Nov 6 11:36:31 2011
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# $NetBSD: pkg_setup,v 1.1 2011/11/06 11:36:31 cheusov Exp $
+#
+# Copyright (c) 2011 Aleksey Cheusov
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# Variables changable by user
+: ${OPSYS:=`uname -s`}
+: ${OSVER:=`uname -r | sed 's/[_-]*$//'`}
+: ${ARCH:=`uname -m`}
+: ${MIRROR:='ftp://ftp.NetBSD.org'}
+: ${FTPDIR:="$MIRROR/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER"}
+: ${FTP_CMD:=ftp -V}
+
+##
+set -e
+
+usage (){
+cat <<'EOF'
+pkg_setup downloads pkg_install binary package and installs it.
+usage: pkg_setup [options] [-- [pkg_add options]]
+
+options:
+ -h display this screen
+ -v verbose output
+ -d url to binary repository, the default is
+ ftp://ftp.netbsd.org/pub/pkgsrc/packages/$OPSYS/$ARCH/$OSVER
+EOF
+}
+
+vecho (){
+test -n "$verbose" && echo "$@"
+}
+
+while getopts hvd: f; do
+case $f in
+h)
+ usage
+ exit 0;;
+v)
+ verbose=1;;
+ d)
+ FTPDIR="$OPTARG";;
+\?)
+ exit 1;;
+esac
+done
+shift $(expr $OPTIND - 1)
+
+tmpdir=`mktemp -d /tmp/pkg_setup.XX`
+trap "rm -rf $tmpdir" 0
+test -n "$tmpdir" || exit 1
+
+cd "$tmpdir"
+
+vecho 'Downloading pkg_summary.gz...'
+$FTP_CMD "$FTPDIR/All/pkg_summary.gz"
+pkgname=`gzip -dc pkg_summary.gz | awk -F= '/^PKGNAME=pkg_install-[0-9]/ {print $2; exit}'`
+if test -z "$pkgname"; then
+echo 'Cannot find package pkg_install in pkg_summary(5)' 1>&2
+exit 1
+fi
+
+vecho "Downloading $pkgname.tgz..."
+$FTP_CMD "$FTPDIR/All/$pkgname.tgz"
+gzip -dc "$pkgname.tgz" | tar -xf -
+
+vecho "Installing..."
+./sbin/pkg_add "$@" ./"$pkgname.tgz"
+
+vecho "done"
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: cheusov Date: Sat Nov 5 00:17:19 UTC 2011 Modified Files: src/external/bsd/iscsi/dist/src/lib: md5hl.c Log Message: Fix segfault when read(2) returns -1 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/iscsi/dist/src/lib/md5hl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/iscsi/dist/src/lib/md5hl.c diff -u src/external/bsd/iscsi/dist/src/lib/md5hl.c:1.2 src/external/bsd/iscsi/dist/src/lib/md5hl.c:1.3 --- src/external/bsd/iscsi/dist/src/lib/md5hl.c:1.2 Tue Jun 30 02:44:52 2009 +++ src/external/bsd/iscsi/dist/src/lib/md5hl.c Sat Nov 5 00:17:19 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: md5hl.c,v 1.2 2009/06/30 02:44:52 agc Exp $ */ +/* $NetBSD: md5hl.c,v 1.3 2011/11/05 00:17:19 cheusov Exp $ */ /* * Written by Jason R. Thorpe , April 29, 1997. @@ -18,7 +18,7 @@ #define _DIAGASSERT(cond) assert(cond) #endif -/* $NetBSD: md5hl.c,v 1.2 2009/06/30 02:44:52 agc Exp $ */ +/* $NetBSD: md5hl.c,v 1.3 2011/11/05 00:17:19 cheusov Exp $ */ /* * @@ -84,7 +84,7 @@ MDNAME(File)(filename, buf) unsigned char buffer[BUFSIZ]; MDNAME(_CTX) ctx; int f, j; - size_t i; + ssize_t i; _DIAGASSERT(filename != 0); /* buf may be NULL */
CVS commit: src/lib/libpam/modules/pam_login_access
Module Name:src Committed By: cheusov Date: Fri Aug 19 11:56:02 UTC 2011 Modified Files: src/lib/libpam/modules/pam_login_access: pam_login_access.8 Log Message: Minor grammar fix To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/lib/libpam/modules/pam_login_access/pam_login_access.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/modules/pam_login_access/pam_login_access.8 diff -u src/lib/libpam/modules/pam_login_access/pam_login_access.8:1.3 src/lib/libpam/modules/pam_login_access/pam_login_access.8:1.4 --- src/lib/libpam/modules/pam_login_access/pam_login_access.8:1.3 Sat Feb 26 15:06:51 2005 +++ src/lib/libpam/modules/pam_login_access/pam_login_access.8 Fri Aug 19 11:56:01 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: pam_login_access.8,v 1.3 2005/02/26 15:06:51 thorpej Exp $ +.\" $NetBSD: pam_login_access.8,v 1.4 2011/08/19 11:56:01 cheusov Exp $ .\" Copyright (c) 2001 Mark R V Murray .\" All rights reserved. .\" Copyright (c) 2001 Networks Associates Technology, Inc. @@ -61,7 +61,7 @@ .Pa login.access account management component .Pq Fn pam_sm_acct_mgmt , -returns success if and only the user is allowed to log in on the +returns success if and only if the user is allowed to log in on the specified tty (in the case of a local login) or from the specified remote host (in the case of a remote login), according to the restrictions listed in
CVS commit: src/usr.bin/make
Module Name:src Committed By: cheusov Date: Sat May 28 21:53:54 UTC 2011 Modified Files: src/usr.bin/make: make.1 Log Message: fix bug in section .ORDER of make.1 To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.191 src/usr.bin/make/make.1:1.192 --- src/usr.bin/make/make.1:1.191 Wed May 4 21:24:59 2011 +++ src/usr.bin/make/make.1 Sat May 28 21:53:54 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.191 2011/05/04 21:24:59 wiz Exp $ +.\" $NetBSD: make.1,v 1.192 2011/05/28 21:53:54 cheusov Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd May 4, 2011 +.Dd May 29, 2011 .Dt MAKE 1 .Os .Sh NAME @@ -1867,7 +1867,7 @@ is built by another part of the dependency graph, the following is a dependency loop: .Bd -literal -\&.ORDER: a b +\&.ORDER: b a b: a .Ed .Pp
CVS commit: src/distrib/notes/common
Module Name:src Committed By: cheusov Date: Sat May 7 11:12:48 UTC 2011 Modified Files: src/distrib/notes/common: main Log Message: Add myself To generate a diff of this commit: cvs rdiff -u -r1.475 -r1.476 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.475 src/distrib/notes/common/main:1.476 --- src/distrib/notes/common/main:1.475 Thu Apr 28 21:39:34 2011 +++ src/distrib/notes/common/main Sat May 7 11:12:48 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.475 2011/04/28 21:39:34 alnsn Exp $ +.\" $NetBSD: main,v 1.476 2011/05/07 11:12:48 cheusov Exp $ .\" .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1117,6 +1117,7 @@ .It Ta Dave Carrel Ta Mt car...@netbsd.org .It Ta James Chacon Ta Mt j...@netbsd.org .It Ta Mihai Chelaru Ta Mt kef...@netbsd.org +.It Ta Aleksey Cheusov Ta Mt cheu...@netbsd.org .It Ta Bill Coldwell Ta Mt bi...@netbsd.org .It Ta Julian Coleman Ta Mt j...@netbsd.org .It Ta Marcus Comstedt Ta Mt mar...@netbsd.org
