Bug 845556, reorganize NSS directory layout, moving files, very large changeset! r=wtc

3 files changed, 232 insertions, 0 deletions

diff --git a/cmd/shlibsign/mangle/Makefile b/cmd/shlibsign/mangle/Makefile
new file mode 100644
index 000000000..b52243e01
--- /dev/null
+++ b/cmd/shlibsign/mangle/Makefile
@@ -0,0 +1,65 @@
+#! gmake
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+ifeq ($(OS_ARCH), WINNT)
+
+EXTRA_LIBS += \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \
+	$(NULL)
+
+else
+
+EXTRA_SHARED_LIBS += \
+	-L$(NSPR_LIB_DIR) \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
+
+endif
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+
+include ../../platrules.mk
+
diff --git a/cmd/shlibsign/mangle/mangle.c b/cmd/shlibsign/mangle/mangle.c
new file mode 100644
index 000000000..3b840ae0b
--- /dev/null
+++ b/cmd/shlibsign/mangle/mangle.c
@@ -0,0 +1,143 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * Test program to mangle 1 bit in a binary
+ *
+ * $Id$
+ */
+
+#include "nspr.h"
+#include "plstr.h"
+#include "plgetopt.h"
+#include "prio.h"
+
+static PRFileDesc *pr_stderr;
+static void
+usage (char *program_name)
+{
+
+    PR_fprintf (pr_stderr, "Usage:");
+    PR_fprintf (pr_stderr, "%s -i shared_library_name -o byte_offset -b bit\n", program_name);
+}
+
+
+int
+main (int argc, char **argv)
+{
+    /* buffers and locals */
+    PLOptState	*optstate;
+    char	*programName;
+    char	cbuf;
+
+    /* parameter set variables */
+    const char  *libFile = NULL; 	
+    int bitOffset = -1;
+
+    /* return values */
+    int		 retval = 2;  /* 0 - test succeeded.
+			       * 1 - illegal args 
+			       * 2 - function failed */
+    PRFileDesc *fd = NULL;
+    int bytesRead;
+    int bytesWritten;
+    PROffset32   offset = -1;
+    PROffset32   pos;
+
+    programName = PL_strrchr(argv[0], '/');
+    programName = programName ? (programName + 1) : argv[0];
+
+    pr_stderr = PR_STDERR;
+
+    optstate = PL_CreateOptState (argc, argv, "i:o:b:");
+    if (optstate == NULL) {
+	return 1;
+    }
+
+    while (PL_GetNextOpt (optstate) == PL_OPT_OK) {
+	switch (optstate->option) {
+          case 'i':
+            libFile = optstate->value;
+            break;
+
+          case 'o':
+            offset = atoi(optstate->value);
+            break;
+
+          case 'b':
+            bitOffset = atoi(optstate->value);
+            break;
+	}
+    }
+
+    if (libFile == NULL) {
+	usage(programName);
+	return 1;
+    }
+    if ((bitOffset >= 8) || (bitOffset < 0)) {
+	usage(programName);
+	return 1;
+    }
+
+    /* open the target signature file */
+    fd = PR_OpenFile(libFile,PR_RDWR,0666);
+    if (fd == NULL ) {
+	/* lperror(libFile); */
+	PR_fprintf(pr_stderr,"Couldn't Open %s\n",libFile);
+	goto loser;
+    }
+
+    if (offset < 0) { /* convert to positive offset */
+	pos = PR_Seek(fd, offset, PR_SEEK_END);
+	if (pos == -1) {
+	    PR_fprintf(pr_stderr,"Seek for read on %s (to %d) failed\n", 
+		       libFile, offset);
+	    goto loser;
+	}
+	offset = pos;
+    }
+
+    /* read the byte */
+    pos = PR_Seek(fd, offset, PR_SEEK_SET);
+    if (pos != offset) {
+	PR_fprintf(pr_stderr,"Seek for read on %s (to %d) failed\n", 
+	           libFile, offset);
+	goto loser;
+    }
+    bytesRead = PR_Read(fd, &cbuf, 1);
+    if (bytesRead != 1) {
+	PR_fprintf(pr_stderr,"Read on %s (to %d) failed\n", libFile, offset);
+	goto loser;
+    }
+
+    PR_fprintf(pr_stderr,"Changing byte 0x%08x (%d): from %02x (%d) to ", 
+		offset, offset, (unsigned char)cbuf, (unsigned char)cbuf);
+    /* change it */
+    cbuf ^= 1 << bitOffset;
+    PR_fprintf(pr_stderr,"%02x (%d)\n", 
+               (unsigned char)cbuf, (unsigned char)cbuf);
+
+    /* write it back out */
+    pos = PR_Seek(fd, offset, PR_SEEK_SET);
+    if (pos != offset) {
+	PR_fprintf(pr_stderr,"Seek for write on %s (to %d) failed\n", 
+	           libFile, offset);
+	goto loser;
+    }
+    bytesWritten = PR_Write(fd, &cbuf, 1);
+    if (bytesWritten != 1) {
+	PR_fprintf(pr_stderr,"Write on %s (to %d) failed\n", libFile, offset);
+	goto loser;
+    }
+
+    retval = 0;
+
+loser:
+    if (fd)
+	PR_Close(fd);
+    PR_Cleanup ();
+    return retval;
+}
+
+/*#DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" */
diff --git a/cmd/shlibsign/mangle/manifest.mn b/cmd/shlibsign/mangle/manifest.mn
new file mode 100644
index 000000000..b08a73ed0
--- /dev/null
+++ b/cmd/shlibsign/mangle/manifest.mn
@@ -0,0 +1,24 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+CORE_DEPTH = ../../../..
+
+# MODULE public and private header  directories are implicitly REQUIRED.
+MODULE = nss
+
+DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\"
+
+CSRCS = \
+	mangle.c \
+	$(NULL)
+
+
+# headers for the MODULE (defined above) are implicitly required.
+REQUIRES = 
+
+PROGRAM = mangle
+
+USE_STATIC_LIBS = 1
+