PERFORCE change 142102 for review
John Birrell
jb at FreeBSD.org
Fri May 23 06:20:27 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142102
Change 142102 by jb at freebsd3 on 2008/05/23 06:19:41
IFC
Affected files ...
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry_strmode.c#3 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_data_into_fd.c#7 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtmalloc/dtmalloc.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#6 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#7 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#12 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#7 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#10 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#5 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#20 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#23 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#31 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#9 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#5 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#27 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#9 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#10 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/instr_size.c#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#10 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#7 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#10 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#10 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#10 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/write.c#12 integrate
Differences ...
==== //depot/projects/dtrace/src/lib/libarchive/archive_entry_strmode.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.2 2008/02/19 05:49:02 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.3 2008/05/23 04:57:28 cperciva Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -39,7 +39,6 @@
const char *
archive_entry_strmode(struct archive_entry *entry)
{
- static const char *perms = "?rwxrwxrwx ";
static const mode_t permbits[] =
{ 0400, 0200, 0100, 0040, 0020, 0010, 0004, 0002, 0001 };
char *bp = entry->strmode;
@@ -47,7 +46,7 @@
int i;
/* Fill in a default string, then selectively override. */
- strcpy(bp, perms);
+ strcpy(bp, "?rwxrwxrwx ");
mode = archive_entry_mode(entry);
switch (archive_entry_filetype(entry)) {
==== //depot/projects/dtrace/src/lib/libarchive/archive_read_data_into_fd.c#7 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.15 2007/04/02 00:21:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -64,8 +64,12 @@
ARCHIVE_OK) {
const char *p = buff;
if (offset > output_offset) {
- lseek(fd, offset - output_offset, SEEK_CUR);
- output_offset = offset;
+ output_offset = lseek(fd,
+ offset - output_offset, SEEK_CUR);
+ if (output_offset != offset) {
+ archive_set_error(a, errno, "Seek error");
+ return (ARCHIVE_FATAL);
+ }
}
while (size > 0) {
bytes_to_write = size;
@@ -74,7 +78,7 @@
bytes_written = write(fd, p, bytes_to_write);
if (bytes_written < 0) {
archive_set_error(a, errno, "Write error");
- return (-1);
+ return (ARCHIVE_FATAL);
}
output_offset += bytes_written;
total_written += bytes_written;
==== //depot/projects/dtrace/src/sys/cddl/dev/dtmalloc/dtmalloc.c#3 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#2 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#2 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#6 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#7 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#12 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/instr_size.c#3 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#7 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#4 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_clone.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#5 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#20 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#23 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#31 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#9 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#5 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_test.c#3 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#27 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#4 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.c#2 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dis_tables.h#3 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#9 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#16 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/instr_size.c#4 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#7 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/sdt/sdt.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#10 (text+ko) ====
==== //depot/projects/dtrace/src/usr.bin/tar/write.c#12 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.68 2008/05/19 18:09:26 cperciva Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.69 2008/05/23 05:07:22 cperciva Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -1100,8 +1100,7 @@
le->previous->next = le->next;
if (le->next != NULL)
le->next->previous = le->previous;
- if (le->name != NULL)
- free(le->name);
+ free(le->name);
if (links_cache->buckets[hash] == le)
links_cache->buckets[hash] = le->next;
links_cache->number_entries--;
More information about the p4-projects
mailing list