Re: HEADS UP! RCNG in the tree...

[Jeroen Ruigrok/asmodai <asmodai@xxxxxx>]

-On [20030724 19:02], Matthew Dillon (dillon@xxxxxxxxxxxxxxxxxxxx) wrote:
>    Good work guys!

Hmm, not tested as well as we would like it to be, I think.

I had a FreeBSD 4.8-Stable from yesterday.  I have a DragonFlyBSD as of
this morning (European time).  buildworld went a-ok, installworld went
a-ok.

Now I am doing a mergemaster -m /vault/trees/DragonFlyBSD/src/etc -svd

And on every installation command I give I get this:

stat: not found
/usr/sbin/mergemaster: arithmetic expression: syntax error: " ~18 & 4095
& " install: invalid file mode:

This is easily fixed by importing FreeBSD HEAD's src/usr.bin/stat into
DragonFlyBSD.
Of course, this doesn't compile straight away since we miss the
birthtimespec/struct timespec stuff in sys/stat.h.  This was all part of
the FFSv2 commits by McKusick.

Use attached patch to fix the imported sources, install the compiled
program, and mergemaster should install the files.

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai
PGP fingerprint: 2D92 980E 45FE 2C28 9DB7  9D88 97E6 839B 2EAC 625B
http://www.tendra.org/   | http://www.in-nomine.org/~asmodai/diary/
Sometimes the Heart wanders in fantasies, keeping the mind in its power
constantly...

Index: stat.1
===================================================================
RCS file: /home/ncvs/FreeBSD/src/usr.bin/stat/stat.1,v
retrieving revision 1.6
diff -u -r1.6 stat.1
--- stat.1	2 Jun 2003 11:19:23 -0000	1.6
+++ stat.1	25 Jul 2003 09:59:32 -0000
@@ -354,8 +354,7 @@
 .It Cm a , m , c , B
 The time
 .Ar file
-was last accessed or modified, of when the inode was last changed, or
-the birth time of the inode.
+was last accessed or modified, or when the inode was last changed.
 .It Cm z
 The size of
 .Ar file
Index: stat.c
===================================================================
RCS file: /home/ncvs/FreeBSD/src/usr.bin/stat/stat.c,v
retrieving revision 1.5
diff -u -r1.5 stat.c
--- stat.c	11 May 2003 23:02:09 -0000	1.5
+++ stat.c	25 Jul 2003 09:58:59 -0000
@@ -65,7 +65,7 @@
 #define SHELL_FORMAT \
 	"st_dev=%d st_ino=%i st_mode=%#p st_nlink=%l " \
 	"st_uid=%u st_gid=%g st_rdev=%r st_size=%z " \
-	"st_atime=%a st_mtime=%m st_ctime=%c st_birthtime=%B " \
+	"st_atime=%a st_mtime=%m st_ctime=%c " \
 	"st_blksize=%k st_blocks=%b"
 #define LINUX_FORMAT \
 	"  File: \"%N\"%n" \
@@ -129,7 +129,6 @@
 #define SHOW_st_atime	'a'
 #define SHOW_st_mtime	'm'
 #define SHOW_st_ctime	'c'
-#define SHOW_st_btime	'B'
 #define SHOW_st_size	'z'
 #define SHOW_st_blocks	'b'
 #define SHOW_st_blksize	'k'
@@ -454,7 +453,6 @@
 			fmtcase(what, SHOW_st_atime);
 			fmtcase(what, SHOW_st_mtime);
 			fmtcase(what, SHOW_st_ctime);
-			fmtcase(what, SHOW_st_btime);
 			fmtcase(what, SHOW_st_size);
 			fmtcase(what, SHOW_st_blocks);
 			fmtcase(what, SHOW_st_blksize);
@@ -632,21 +630,6 @@
 		if (tsp == NULL)
 			tsp = &st->st_ctimespec;
 		/* FALLTHROUGH */
-	case SHOW_st_btime:
-		if (tsp == NULL)
-			tsp = &st->st_birthtimespec;
-		ts = *tsp;		/* copy so we can muck with it */
-		small = (sizeof(ts.tv_sec) == 4);
-		data = ts.tv_sec;
-		small = 1;
-		tm = localtime(&ts.tv_sec);
-		(void)strftime(path, sizeof(path), timefmt, tm);
-		sdata = path;
-		formats = FMTF_DECIMAL | FMTF_OCTAL | FMTF_UNSIGNED | FMTF_HEX |
-		    FMTF_FLOAT | FMTF_STRING;
-		if (ofmt == 0)
-			ofmt = FMTF_DECIMAL;
-		break;
 	case SHOW_st_size:
 		small = (sizeof(st->st_size) == 4);
 		data = st->st_size;