Duh, this note should have included these diffs, too:
14:30 fiveten [~] {1:0}% ssh elpaso.eng diff -u
/ws/onnv-gate/usr/src/tools/findunref/findunref.c
/home/mjnelson/work/scm/scm-fixes/usr/src/tools/findunref/findunref.c
--- /ws/onnv-gate/usr/src/tools/findunref/findunref.c Sat Jun 11
14:42:57 2005
+++ /home/mjnelson/work/scm/scm-fixes/usr/src/tools/findunref/findunref.c
Wed Jun 11 11:02:28 2008
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,13 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
+#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma ident "@(#)findunref.c 1.2 05/06/08 SMI"
-
/*
* Finds all unreferenced files in a source tree that do not match a list
of
* permitted pathnames.
@@ -156,8 +155,6 @@
char *newline;
pnset_t *pnsetp;
unsigned int i;
- char *builtin[] = { "*/SCCS", "*/.del-*", "*/.make.*",
- "*.flg", NULL };
pnsetp = calloc(sizeof (pnset_t), 1);
if (pnsetp == NULL)
@@ -164,14 +161,6 @@
return (NULL);
/*
- * Add the built-in exceptions.
- */
- for (i = 0; builtin[i] != NULL; i++) {
- if (pnset_add(pnsetp, builtin[i]) == 0)
- goto fail;
- }
-
- /*
* Add any exceptions from the file.
*/
fp = fopen(exceptfile, "r");
14:31 fiveten [~] {2:1}%
> http://cr.opensolaris.org/~mjnelson/webrev.512.528/
>
> This covers the following:
>
> 512 exclusion list has dropped an entry
> 528 revert findunref from Python to c
>
> Some caveats:
>
> - If you don't invoke nightly in a way that nightly.sh understands, it
> can't always find the which_scm binary. That's a problem for testing
> these changes (see below), but not really for most users
> post-tools-putback. On a related note, I tested the bldenv changes, and
> they exported SCM_TYPE correctly, and a subsequent build of the
> exception_list correctly included mercurial.
>
> - The restoration of findunref.c, though done using Mercurial, seems to
> have only carried along part of the file history. An hg log understands
> that the file was added in rev 0, and modified in tip, but it does not
> show the intermediate removal back in rev 4838. And an hg annotate of
> the file shows all lines associated with tip, rather than rev 0, as I
> would expect. I don't think this is a big deal, because (until this
> putback) we have not modified findunref.c, so when we create a teamware
> workspace and integrate the tools, it really will be a straightforward
> modification.
>
> - I got rid of the multiple invocations of findunref in nightly.sh, but I
> preserved the path munging. I think that's wrong, but the fix is (now)
> simply to remove the sed from nightly.sh. I didn't do that here,
> because I think it warrants asking the gk team about whether they mind a
> massive unref diff from the first nightly following our putback.
>
> - Per code review discussions that I'm finally catching up with, the .flg
> exclusions might belong in exception_list.common, instead of .teamware.
>
> - Because of the which_scm problem mentioned above, the
> exception_list.mercurial file was not used during my builds.
>
> - So attached to this note you'll find four files. The unreferenced
> master files from the gate and from my build, and the one from my build
> modified to elide the .flg and .hg files per the previous two bullet
> items, and the diffs between the two. I believe that the diffs
> need to be addressed via the exception_list files, and that I have
> mucked up their content during my backout/merge/changes/recommit. So
> please leave off analysing these carefully until you hear from me that
> I've adjusted 'em (or tell me what I got wrong...)
>
> --Mark
