[darwinbuild-changes] [385] trunk/darwinup

[source_changes at macosforge.org]

Revision: 385
          http://trac.macosforge.org/projects/darwinbuild/changeset/385
Author:   kvv at apple.com
Date:     2008-09-17 23:42:57 -0700 (Wed, 17 Sep 2008)
Log Message:
-----------
UNIX03 changes

Modified Paths:
--------------
    trunk/darwinup/Archive.h
    trunk/darwinup/Depot.cpp
    trunk/darwinup/Makefile
    trunk/darwinup/SerialSet.h
    trunk/darwinup/Utils.h

Modified: trunk/darwinup/Archive.h
===================================================================
--- trunk/darwinup/Archive.h	2008-09-18 01:06:55 UTC (rev 384)
+++ trunk/darwinup/Archive.h	2008-09-18 06:42:57 UTC (rev 385)
@@ -21,6 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>

Modified: trunk/darwinup/Depot.cpp
===================================================================
--- trunk/darwinup/Depot.cpp	2008-09-18 01:06:55 UTC (rev 384)
+++ trunk/darwinup/Depot.cpp	2008-09-18 06:42:57 UTC (rev 385)
@@ -335,8 +335,11 @@
 			// If we're going to need to squirrel away data, create
 			// the directory hierarchy now.
 			if (INFO_TEST(actual->info(), FILE_INFO_ROLLBACK_DATA)) {
-				const char* path = actual->path();
+				char path[PATH_MAX];
 				char* backup_dirpath;
+
+				size_t len = strlcpy(path, actual->path(), sizeof(path));
+				assert(len <= sizeof(path));
 				
 				const char* dir = dirname(path);
 				assert(dir != NULL);

Modified: trunk/darwinup/Makefile
===================================================================
--- trunk/darwinup/Makefile	2008-09-18 01:06:55 UTC (rev 384)
+++ trunk/darwinup/Makefile	2008-09-18 06:42:57 UTC (rev 385)
@@ -11,8 +11,12 @@
 
 # libredo.o is generated from cctools_ofiles
 
+REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \
+		echo /usr/local/lib/libredo_prebinding.a ; else \
+		echo libredo.o ; fi)
+
 darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \
-	  libredo.o
+	$(REDO)
 	g++ -lcrypto -lsqlite3 -o $@ $^
 
 clean:

Modified: trunk/darwinup/SerialSet.h
===================================================================
--- trunk/darwinup/SerialSet.h	2008-09-18 01:06:55 UTC (rev 384)
+++ trunk/darwinup/SerialSet.h	2008-09-18 06:42:57 UTC (rev 385)
@@ -21,6 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <stdint.h>
 #include <sys/types.h>
 
 // a variably lengthed set of serial numbers from the database

Modified: trunk/darwinup/Utils.h
===================================================================
--- trunk/darwinup/Utils.h	2008-09-18 01:06:55 UTC (rev 384)
+++ trunk/darwinup/Utils.h	2008-09-18 06:42:57 UTC (rev 385)
@@ -21,6 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <stdint.h>
 #include <sys/types.h>
 #include <fts.h>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20080917/3acf38c0/attachment.html