pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/pkgtools/plist-utils
Module Name: pkgsrc
Committed By: adam
Date: Fri Feb 23 06:31:34 UTC 2018
Modified Files:
pkgsrc/pkgtools/plist-utils: Makefile
pkgsrc/pkgtools/plist-utils/files: plist_tree.c sort.c
Log Message:
plist-utils: updated to 20180222
20180222:
Also sort the first line (@comment $NetBSD$) as it should be on top.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/plist-utils/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/plist-utils/files/plist_tree.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/plist-utils/files/sort.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/pkgtools/plist-utils/Makefile
diff -u pkgsrc/pkgtools/plist-utils/Makefile:1.3 pkgsrc/pkgtools/plist-utils/Makefile:1.4
--- pkgsrc/pkgtools/plist-utils/Makefile:1.3 Sat Sep 30 13:23:05 2017
+++ pkgsrc/pkgtools/plist-utils/Makefile Fri Feb 23 06:31:34 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/09/30 13:23:05 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/23 06:31:34 adam Exp $
-PKGNAME= plist-utils-20170813
+PKGNAME= plist-utils-20180222
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
Index: pkgsrc/pkgtools/plist-utils/files/plist_tree.c
diff -u pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.3 pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.4
--- pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.3 Sat Sep 30 13:23:06 2017
+++ pkgsrc/pkgtools/plist-utils/files/plist_tree.c Fri Feb 23 06:31:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: plist_tree.c,v 1.3 2017/09/30 13:23:06 adam Exp $ */
+/* $NetBSD: plist_tree.c,v 1.4 2018/02/23 06:31:34 adam Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: plist_tree.c,v 1.3 2017/09/30 13:23:06 adam Exp $");
+__RCSID("$NetBSD: plist_tree.c,v 1.4 2018/02/23 06:31:34 adam Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -128,7 +128,7 @@ plist_tree_init(void)
char *
get_key(const char *entry)
{
- char *copy, *s;
+ char *copy;
size_t n = 0;
regmatch_t rm[10];
int ret;
Index: pkgsrc/pkgtools/plist-utils/files/sort.c
diff -u pkgsrc/pkgtools/plist-utils/files/sort.c:1.1 pkgsrc/pkgtools/plist-utils/files/sort.c:1.2
--- pkgsrc/pkgtools/plist-utils/files/sort.c:1.1 Sat Oct 1 18:37:15 2016
+++ pkgsrc/pkgtools/plist-utils/files/sort.c Fri Feb 23 06:31:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.1 2016/10/01 18:37:15 kamil Exp $ */
+/* $NetBSD: sort.c,v 1.2 2018/02/23 06:31:34 adam Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: sort.c,v 1.1 2016/10/01 18:37:15 kamil Exp $");
+__RCSID("$NetBSD: sort.c,v 1.2 2018/02/23 06:31:34 adam Exp $");
#include <err.h>
#include <fcntl.h>
@@ -50,7 +50,6 @@ main(int argc, char **argv)
int iflag = 0;
char *buffer;
FILE *stream;
- char *firstline;
setprogname(argv[0]);
@@ -84,10 +83,6 @@ main(int argc, char **argv)
}
/* Read entries and put into tree */
- /* The first line is special */
- if ((buffer = plist_getline(stream)) != NULL) {
- firstline = buffer;
- }
while ((buffer = plist_getline(stream)) != NULL) {
plist_tree_insert(buffer);
@@ -107,7 +102,6 @@ main(int argc, char **argv)
stream = stdout;
}
- fprintf(stream, "%s\n", firstline);
plist_tree_dump(stream);
return EXIT_SUCCESS;
Home |
Main Index |
Thread Index |
Old Index