PERFORCE change 159935 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Fri Mar 27 16:09:58 PDT 2009
http://perforce.freebsd.org/chv.cgi?CH=159935
Change 159935 by trasz at trasz_victim7 on 2009/03/27 23:09:53
IFC.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-decl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/savefile.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/stdio.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_debug.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_open.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/mpool/mpool.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/Makefile.inc#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/be_BY.UTF-8.msg#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/de_DE.ISO8859-1.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/ptrace.2#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmclog.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/PICOBSD#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/config#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/crunch.conf#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/build/picobsd#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/floppy.tree/etc/rc1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/sparc64/mkisoimages.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/label/glabel.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ath.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ath_hal.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/fe.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/wlan.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/skel/dot.login#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/skel/dot.profile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/genwakecode.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/fpu.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtnfsclient/dtnfsclient.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#33 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/ati_pcigart.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_irq.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_scatter.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_dma.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_irq.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ed/if_ed_pccard.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fe/if_fe_pccard.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptiop/hptiop.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipmi/ipmi_linux.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccarddevs#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/label/g_label.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/label/g_label.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/label/g_label_ufs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_apm.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_ebr.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/npx.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtnfsclient/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ipmi/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ipmi/ipmi_linux/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/linprocfs/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_kdtrace.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_kdtrace.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/dtrace_bsd.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/login/login.c#2 integrate
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.2 2009/03/25 20:15:48 lulf Exp $
*/
#include <assert.h>
@@ -140,7 +140,7 @@
struct delta *);
static struct stream *rcsfile_getdeltatext(struct rcsfile *, struct delta *,
struct buf **);
-static void rcsdelta_writestring(char *, size_t, struct stream *);
+static int rcsdelta_writestring(char *, size_t, struct stream *);
static void rcsdelta_insertbranch(struct delta *, struct branch *);
/* Space formatting of RCS file. */
@@ -308,14 +308,19 @@
/* First write head. */
d = LIST_FIRST(&rf->trunk->deltalist);
- stream_printf(dest, "head%s%s;\n", head_space, d->revnum);
+ if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0)
+ return (-1);
/* Write branch, if we have. */
- if (rf->branch != NULL)
- stream_printf(dest, "branch%s%s;\n", branch_space, rf->branch);
+ if (rf->branch != NULL) {
+ if (stream_printf(dest, "branch%s%s;\n", branch_space,
+ rf->branch) < 0)
+ return (-1);
+ }
/* Write access. */
- stream_printf(dest, "access");
+ if (stream_printf(dest, "access") < 0)
+ return (-1);
#if 0
if (!STAILQ_EMPTY(&rf->accesslist)) {
/*
@@ -324,32 +329,44 @@
*/
}
#endif
- stream_printf(dest, ";\n");
+ if (stream_printf(dest, ";\n") < 0)
+ return (-1);
/* Write out taglist. */
- stream_printf(dest, "symbols");
+ if (stream_printf(dest, "symbols") < 0)
+ return (-1);
if (!STAILQ_EMPTY(&rf->taglist)) {
STAILQ_FOREACH(t, &rf->taglist, tag_next) {
- stream_printf(dest, "\n%s%s:%s", tag_space, t->tag,
- t->revnum);
+ if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag,
+ t->revnum) < 0)
+ return (-1);
}
}
- stream_printf(dest, ";\n");
/* Write out locks and strict. */
- stream_printf(dest, "locks;");
- if (rf->strictlock)
- stream_printf(dest, " strict;");
- stream_printf(dest, "\n");
+ if (stream_printf(dest, ";\nlocks;") < 0)
+ return (-1);
+ if (rf->strictlock) {
+ if (stream_printf(dest, " strict;") < 0)
+ return (-1);
+ }
+ if (stream_printf(dest, "\n") < 0)
+ return (-1);
/* Write out the comment. */
- if (rf->comment != NULL)
- stream_printf(dest, "comment%s%s;\n", comment_space, rf->comment);
- if (rf->expand != EXPAND_DEFAULT)
- stream_printf(dest, "expand%s@%s@;\n", expand_space,
- keyword_encode_expand(rf->expand));
+ if (rf->comment != NULL) {
+ if (stream_printf(dest, "comment%s%s;\n", comment_space,
+ rf->comment) < 0)
+ return (-1);
+ }
+ if (rf->expand != EXPAND_DEFAULT) {
+ if (stream_printf(dest, "expand%s@%s@;\n", expand_space,
+ keyword_encode_expand(rf->expand)) < 0)
+ return (-1);
+ }
- stream_printf(dest, "\n\n");
+ if (stream_printf(dest, "\n\n") < 0)
+ return (-1);
/*
* Write out deltas. We use a stack where we push the appropriate deltas
@@ -364,14 +381,18 @@
/* Do not write out placeholders just to be safe. */
if (d->placeholder)
continue;
- stream_printf(dest, "%s\n", d->revnum);
- stream_printf(dest, "date%s%s;%sauthor %s;%sstate",
+ if (stream_printf(dest, "%s\n", d->revnum) < 0)
+ return (-1);
+ if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate",
date_space, d->revdate, auth_space, d->author,
- state_space);
- if (d->state != NULL)
- stream_printf(dest, " %s", d->state);
- stream_printf(dest, ";\n");
- stream_printf(dest, "branches");
+ state_space) < 0)
+ return (-1);
+ if (d->state != NULL) {
+ if (stream_printf(dest, " %s", d->state) < 0)
+ return (-1);
+ }
+ if (stream_printf(dest, ";\nbranches") < 0)
+ return (-1);
/*
* Write out our branches. Add them to a reversed list for use
* later when we write out the text.
@@ -385,30 +406,36 @@
/* Push branch heads on stack. */
STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) {
- if (d_tmp == NULL)
- err(1, "empty branch!");
- stream_printf(dest, "\n%s%s", branches_space,
- d_tmp->revnum);
+ if (d_tmp == NULL) {
+ lprintf(2, "Empty branch!\n");
+ return (-1);
+ }
+ if (stream_printf(dest, "\n%s%s", branches_space,
+ d_tmp->revnum) < 0)
+ return (-1);
}
- stream_printf(dest, ";\n");
- stream_printf(dest, "next%s", next_space);
+ if (stream_printf(dest, ";\nnext%s", next_space) < 0)
+ return (-1);
/* Push next delta on stack. */
d_next = LIST_NEXT(d, delta_next);
if (d_next != NULL) {
- stream_printf(dest, "%s", d_next->revnum);
+ if (stream_printf(dest, "%s", d_next->revnum) < 0)
+ return (-1);
STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next);
}
- stream_printf(dest, ";\n\n");
+ if (stream_printf(dest, ";\n\n") < 0)
+ return (-1);
}
- stream_printf(dest, "\n");
/* Write out desc. */
- stream_printf(dest, "desc\n@@");
+ if (stream_printf(dest, "\ndesc\n@@") < 0)
+ return (-1);
d = LIST_FIRST(&rf->trunk->deltalist);
/* Write out deltatexts. */
error = rcsfile_write_deltatext(rf, dest);
- stream_printf(dest, "\n");
+ if (stream_printf(dest, "\n") < 0)
+ return (-1);
return (error);
}
@@ -438,21 +465,25 @@
/* Do not write out placeholders just to be safe. */
if (d->placeholder)
return (0);
- stream_printf(dest, "\n\n\n%s\n", d->revnum);
- stream_printf(dest, "log\n@");
+ if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0)
+ return (-1);
+ if (stream_printf(dest, "log\n@") < 0)
+ return (-1);
in = stream_open_buf(d->log);
line = stream_getln(in, &size);
while (line != NULL) {
- stream_write(dest, line, size);
+ if (stream_write(dest, line, size) == -1)
+ return (-1);
line = stream_getln(in, &size);
}
stream_close(in);
- stream_printf(dest, "@\n");
- stream_printf(dest, "text\n@");
+ if (stream_printf(dest, "@\ntext\n@") < 0)
+ return (-1);
error = rcsfile_puttext(rf, dest, d, d->prev);
if (error)
return (error);
- stream_printf(dest, "@");
+ if (stream_printf(dest, "@") < 0)
+ return (-1);
LIST_INIT(&branchlist_datesorted);
d_next = LIST_NEXT(d, delta_next);
@@ -535,7 +566,10 @@
in = stream_open_buf(d->text);
line = stream_getln(in, &size);
while (line != NULL) {
- stream_write(dest, line, size);
+ if (stream_write(dest, line, size) == -1) {
+ error = -1;
+ goto cleanup;
+ }
line = stream_getln(in, &size);
}
stream_close(in);
@@ -549,7 +583,10 @@
}
line = stream_getln(orig, &size);
while (line != NULL) {
- stream_write(dest, line, size);
+ if (stream_write(dest, line, size) == -1) {
+ error = -1;
+ goto cleanup;
+ }
line = stream_getln(orig, &size);
}
stream_close(orig);
@@ -1261,6 +1298,7 @@
rcsdelta_addlog(struct delta *d, char *log, int len)
{
struct stream *dest;
+ int nbytes;
assert(d != NULL);
/* Strip away '@' at beginning and end. */
@@ -1268,9 +1306,9 @@
len--;
log[len - 1] = '\0';
dest = stream_open_buf(d->log);
- stream_write(dest, log, len - 1);
+ nbytes = stream_write(dest, log, len - 1);
stream_close(dest);
- return (0);
+ return ((nbytes == -1) ? -1 : 0);
}
/* Add deltatext to a delta. Assume the delta already exists. */
@@ -1278,6 +1316,7 @@
rcsdelta_addtext(struct delta *d, char *text, int len)
{
struct stream *dest;
+ int nbytes;
assert(d != NULL);
/* Strip away '@' at beginning and end. */
@@ -1286,36 +1325,40 @@
text[len - 1] = '\0';
dest = stream_open_buf(d->text);
- stream_write(dest, text, len - 1);
+ nbytes = stream_write(dest, text, len - 1);
stream_close(dest);
- return (0);
+ return ((nbytes == -1) ? -1 : 0);
}
/* Add a deltatext logline to a delta. */
-void
+int
rcsdelta_appendlog(struct delta *d, char *logline, size_t size)
{
struct stream *dest;
+ int error;
assert(d != NULL);
dest = stream_open_buf(d->log);
- rcsdelta_writestring(logline, size, dest);
+ error = rcsdelta_writestring(logline, size, dest);
stream_close(dest);
+ return (error);
}
/* Add a deltatext textline to a delta. */
-void
+int
rcsdelta_appendtext(struct delta *d, char *textline, size_t size)
{
struct stream *dest;
+ int error;
assert(d != NULL);
dest = stream_open_buf(d->text);
- rcsdelta_writestring(textline, size, dest);
+ error = rcsdelta_writestring(textline, size, dest);
stream_close(dest);
+ return (error);
}
-static void
+static int
rcsdelta_writestring(char *textline, size_t size, struct stream *dest)
{
char buf[3];
@@ -1332,8 +1375,10 @@
buf[2] = '\0';
count = 2;
}
- stream_write(dest, buf, count);
+ if (stream_write(dest, buf, count) == -1)
+ return (-1);
}
+ return (0);
}
/* Set delta state. */
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.2 2009/03/25 20:15:48 lulf Exp $
*/
#ifndef _RCSFILE_H_
@@ -65,8 +65,8 @@
int rcsdelta_addlog(struct delta *, char *, int);
int rcsdelta_addtext(struct delta *, char *, int);
-void rcsdelta_appendlog(struct delta *, char *, size_t);
-void rcsdelta_appendtext(struct delta *, char *, size_t);
+int rcsdelta_appendlog(struct delta *, char *, size_t);
+int rcsdelta_appendtext(struct delta *, char *, size_t);
void rcsdelta_setstate(struct delta *, char *);
void rcsdelta_truncatetext(struct delta *, off_t);
void rcsdelta_truncatelog(struct delta *, off_t);
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.1 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.2 2009/03/25 20:15:48 lulf Exp $
*/
#include <assert.h>
@@ -309,7 +309,7 @@
error = 0;
/* In case we don't have deltatexts. */
if (token != NUM)
- return (token);
+ return (-1);
do {
/* num */
assert(token == NUM);
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#5 (text) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/updater.c,v 1.4 2009/03/06 20:17:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/updater.c,v 1.6 2009/03/25 20:15:48 lulf Exp $
*/
#include <sys/types.h>
@@ -1385,8 +1385,11 @@
do {
nread = stream_read(up->rd, buf, (BUFSIZE > remains ?
remains : BUFSIZE));
+ if (nread == -1)
+ return (UPDATER_ERR_PROTO);
remains -= nread;
- stream_write(to, buf, nread);
+ if (stream_write(to, buf, nread) == -1)
+ goto bad;
} while (remains > 0);
stream_close(to);
line = stream_getln(up->rd, NULL);
@@ -1411,9 +1414,11 @@
FA_MODTIME | FA_MASK);
error = updater_updatefile(up, fup, md5, isfixup);
fup->wantmd5 = NULL; /* So that it doesn't get freed. */
- if (error)
- return (error);
- return (0);
+ return (error);
+bad:
+ xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+ strerror(errno));
+ return (UPDATER_ERR_MSG);
}
static int
@@ -1469,7 +1474,9 @@
if (nbytes == -1)
goto bad;
}
- stream_write(to, line, size);
+ nbytes = stream_write(to, line, size);
+ if (nbytes == -1)
+ goto bad;
line = stream_getln(up->rd, &size);
first = 0;
}
@@ -1661,6 +1668,7 @@
else
lprintf(1, " Touch %s", fup->coname);
/* Install new attributes. */
+ fattr_umask(sr->sr_serverattr, coll->co_umask);
fattr_install(sr->sr_serverattr, fup->destpath, NULL);
if (fup->attic)
lprintf(1, " -> Attic");
@@ -1681,8 +1689,11 @@
error = rcsfile_write(rf, dest);
stream_close(dest);
rcsfile_free(rf);
- if (error)
- lprintf(-1, "Error writing %s\n", name);
+ if (error) {
+ xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+ strerror(errno));
+ return (UPDATER_ERR_MSG);
+ }
finish:
sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW);
@@ -1767,7 +1778,9 @@
size--;
logline++;
}
- rcsdelta_appendlog(d, logline, size);
+ if (rcsdelta_appendlog(d, logline, size)
+ < 0)
+ return (-1);
logline = stream_getln(rd, &size);
}
break;
@@ -1798,7 +1811,9 @@
size--;
textline++;
}
- rcsdelta_appendtext(d, textline, size);
+ if (rcsdelta_appendtext(d, textline,
+ size) < 0)
+ return (-1);
textline = stream_getln(rd, &size);
}
break;
@@ -1838,8 +1853,15 @@
stream_filter_start(to, STREAM_FILTER_MD5, md5);
/* First write the existing content. */
- while ((nread = read(fd, buf, BUFSIZE)) > 0)
- stream_write(to, buf, nread);
+ while ((nread = read(fd, buf, BUFSIZE)) > 0) {
+ if (stream_write(to, buf, nread) == -1)
+ goto bad;
+ }
+ if (nread == -1) {
+ xasprintf(&up->errmsg, "%s: Error reading: %s",
+ strerror(errno));
+ return (UPDATER_ERR_MSG);
+ }
close(fd);
bytes = fattr_filesize(fa) - pos;
@@ -1847,8 +1869,11 @@
do {
nread = stream_read(up->rd, buf,
(BUFSIZE > bytes) ? bytes : BUFSIZE);
+ if (nread == -1)
+ return (UPDATER_ERR_PROTO);
bytes -= nread;
- stream_write(to, buf, nread);
+ if (stream_write(to, buf, nread) == -1)
+ goto bad;
} while (bytes > 0);
stream_close(to);
@@ -1874,9 +1899,11 @@
FA_MODTIME | FA_MASK);
error = updater_updatefile(up, fup, md5, 0);
fup->wantmd5 = NULL; /* So that it doesn't get freed. */
- if (error)
- return (error);
- return (0);
+ return (error);
+bad:
+ xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
+ strerror(errno));
+ return (UPDATER_ERR_MSG);
}
/*
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-decl.c#3 (text+ko) ====
@@ -19,7 +19,7 @@
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.16 2009/03/14 19:36:13 das Exp $ */
+/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.17 2009/03/25 05:10:32 das Exp $ */
/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */
/* Fixed problems with compiling inline-25.c and inline-26.c */
/* XXX still fails inline-29.c, inline-31.c, and inline-32.c */
@@ -798,7 +798,9 @@
&& DECL_ABSTRACT_ORIGIN (p) != p)
TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1;
if (!DECL_EXTERNAL (p)
- && DECL_INITIAL (p) == 0)
+ && DECL_INITIAL (p) == 0
+ && scope != file_scope
+ && scope != external_scope)
{
error ("nested function %q+D declared but never defined", p);
undef_nested_function = true;
==== //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/savefile.c#4 (text+ko) ====
@@ -908,7 +908,7 @@
{ DLT_IPMB, LINKTYPE_IPMB },
/* enc0 device */
- { DLT_ENC, LINKTYPE_ENC },
+ { DLT_ENC, LINKTYPE_ENC },
/* Juniper Secure Tunnel */
{ DLT_JUNIPER_ST, LINKTYPE_JUNIPER_ST },
==== //depot/projects/soc2008/trasz_nfs4acl/include/stdio.h#3 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.77 2009/03/14 19:12:11 das Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.78 2009/03/25 08:07:52 das Exp $
*/
#ifndef _STDIO_H_
@@ -381,7 +381,7 @@
#endif
#ifdef _WITH_DPRINTF
-int dprintf(int, const char * __restrict, ...);
+int (dprintf)(int, const char * __restrict, ...);
#endif
#endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 */
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_debug.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.5 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.6 2009/03/23 23:22:09 delphij Exp $");
#include <sys/param.h>
@@ -61,7 +61,7 @@
char *sep;
t = dbp->internal;
- (void)fprintf(stderr, "%s: pgsz %d",
+ (void)fprintf(stderr, "%s: pgsz %u",
F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize);
if (F_ISSET(t, R_RECNO))
(void)fprintf(stderr, " keys %u", t->bt_nrecs);
@@ -157,7 +157,7 @@
indx_t cur, top;
char *sep;
- (void)fprintf(stderr, " page %d: (", h->pgno);
+ (void)fprintf(stderr, " page %u: (", h->pgno);
#undef X
#define X(flag, name) \
if (h->flags & flag) { \
@@ -174,7 +174,7 @@
(void)fprintf(stderr, ")\n");
#undef X
- (void)fprintf(stderr, "\tprev %2d next %2d", h->prevpg, h->nextpg);
+ (void)fprintf(stderr, "\tprev %2u next %2u", h->prevpg, h->nextpg);
if (h->flags & P_OVERFLOW)
return;
@@ -292,27 +292,27 @@
(void)mpool_put(t->bt_mp, h, 0);
}
- (void)fprintf(stderr, "%d level%s with %ld keys",
+ (void)fprintf(stderr, "%d level%s with %lu keys",
levels, levels == 1 ? "" : "s", nkeys);
if (F_ISSET(t, R_RECNO))
- (void)fprintf(stderr, " (%d header count)", t->bt_nrecs);
+ (void)fprintf(stderr, " (%u header count)", t->bt_nrecs);
(void)fprintf(stderr,
- "\n%u pages (leaf %d, internal %d, overflow %d)\n",
+ "\n%u pages (leaf %u, internal %u, overflow %u)\n",
pinternal + pleaf + pcont, pleaf, pinternal, pcont);
- (void)fprintf(stderr, "%ld cache hits, %ld cache misses\n",
+ (void)fprintf(stderr, "%lu cache hits, %lu cache misses\n",
bt_cache_hit, bt_cache_miss);
(void)fprintf(stderr, "%lu splits (%lu root splits, %lu sort splits)\n",
bt_split, bt_rootsplit, bt_sortsplit);
pleaf *= t->bt_psize - BTDATAOFF;
if (pleaf)
(void)fprintf(stderr,
- "%.0f%% leaf fill (%ld bytes used, %ld bytes free)\n",
+ "%.0f%% leaf fill (%lu bytes used, %lu bytes free)\n",
((double)(pleaf - lfree) / pleaf) * 100,
pleaf - lfree, lfree);
pinternal *= t->bt_psize - BTDATAOFF;
if (pinternal)
(void)fprintf(stderr,
- "%.0f%% internal fill (%ld bytes used, %ld bytes free\n",
+ "%.0f%% internal fill (%lu bytes used, %lu bytes free\n",
((double)(pinternal - ifree) / pinternal) * 100,
pinternal - ifree, ifree);
if (bt_pfxsaved)
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/btree/bt_open.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)bt_open.c 8.10 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.14 2009/03/04 00:58:04 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.15 2009/03/23 23:43:07 delphij Exp $");
/*
* Implementation of btree access method for 4.4BSD.
@@ -96,7 +96,7 @@
DB *dbp;
pgno_t ncache;
ssize_t nr;
- int machine_lorder;
+ int machine_lorder, saved_errno;
t = NULL;
@@ -327,13 +327,15 @@
eftype: errno = EFTYPE;
goto err;
-err: if (t) {
+err: saved_errno = errno;
+ if (t) {
if (t->bt_dbp)
free(t->bt_dbp);
if (t->bt_fd != -1)
(void)_close(t->bt_fd);
free(t);
}
+ errno = saved_errno;
return (NULL);
}
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/db/mpool/mpool.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.14 2009/03/02 23:47:18 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.15 2009/03/23 23:22:09 delphij Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -406,9 +406,9 @@
int cnt;
char *sep;
- (void)fprintf(stderr, "%u pages in the file\n", mp->npages);
+ (void)fprintf(stderr, "%lu pages in the file\n", mp->npages);
(void)fprintf(stderr,
- "page size %lu, cacheing %u pages of %u page max cache\n",
+ "page size %lu, cacheing %lu pages of %lu page max cache\n",
mp->pagesize, mp->curcache, mp->maxcache);
(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
mp->pageput, mp->pageget, mp->pagenew);
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.c#3 (text+ko) ====
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.88 2009/02/08 16:58:05 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.90 2009/03/25 16:23:43 ume Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -165,18 +165,24 @@
static const struct explore explore[] = {
#if 0
- { PF_LOCAL, 0, ANY, ANY, NULL, 0x01 },
+ { PF_LOCAL, ANY, ANY, NULL, 0x01 },
#endif
#ifdef INET6
{ PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
+ { PF_INET6, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 },
+ { PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 },
{ PF_INET6, SOCK_RAW, ANY, NULL, 0x05 },
#endif
{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
{ PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
+ { PF_INET, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 },
+ { PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 },
{ PF_INET, SOCK_RAW, ANY, NULL, 0x05 },
{ PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
{ PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
+ { PF_UNSPEC, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 },
+ { PF_UNSPEC, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 },
{ PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 },
{ -1, 0, 0, NULL, 0 },
};
@@ -417,10 +423,12 @@
if (ex->e_protocol == ANY)
continue;
if (pai->ai_socktype == ex->e_socktype &&
- pai->ai_protocol != ex->e_protocol) {
- ERR(EAI_BADHINTS);
- }
+ pai->ai_protocol == ex->e_protocol)
+ break;
}
+
+ if (ex->e_af < 0)
+ ERR(EAI_BADHINTS);
}
}
@@ -1344,10 +1352,21 @@
return EAI_SERVICE;
case SOCK_DGRAM:
case SOCK_STREAM:
+ case SOCK_SEQPACKET:
allownumeric = 1;
break;
case ANY:
- allownumeric = 0;
+ switch (ai->ai_family) {
+ case AF_INET:
+#ifdef AF_INET6
+ case AF_INET6:
+#endif
+ allownumeric = 1;
+ break;
+ default:
+ allownumeric = 0;
+ break;
+ }
break;
default:
return EAI_SOCKTYPE;
@@ -1363,13 +1382,17 @@
} else {
if (ai->ai_flags & AI_NUMERICSERV)
return EAI_NONAME;
- switch (ai->ai_socktype) {
- case SOCK_DGRAM:
+
+ switch (ai->ai_protocol) {
+ case IPPROTO_UDP:
proto = "udp";
break;
- case SOCK_STREAM:
+ case IPPROTO_TCP:
proto = "tcp";
break;
+ case IPPROTO_SCTP:
+ proto = "sctp";
+ break;
default:
proto = NULL;
break;
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.16 2009/03/20 23:55:01 gabor Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.17 2009/03/24 23:31:41 gabor Exp $
.PATH: ${.CURDIR}/nls
@@ -13,6 +13,7 @@
# for translators.
NLSNAME= libc
+NLS+= be_BY.UTF-8
NLS+= ca_ES.ISO8859-1
NLS+= de_DE.ISO8859-1
NLS+= el_GR.ISO8859-7
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/de_DE.ISO8859-1.msg#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/de_DE.ISO8859-1.msg,v 1.2 2009/03/16 16:33:08 gabor Exp $
+$ $FreeBSD: src/lib/libc/nls/de_DE.ISO8859-1.msg,v 1.3 2009/03/25 12:36:37 netchild Exp $
$
$ Message catalog for de_DE.ISO8859-1 locale
$
@@ -14,7 +14,7 @@
$ EINTR
4 Interrupt innerhalb eines Systemaufrufs
$ EIO
-5 Ein/Ausgabefehler
+5 Ein-/Ausgabefehler
$ ENXIO
6 Gerät ist nicht konfiguriert
$ E2BIG
@@ -56,7 +56,7 @@
$ ENOTTY
25 Ungültiger IOCTL für dieses Gerät
$ ETXTBSY
-26 Text-Datei ist belegt
+26 Datei wird benutzt
$ EFBIG
27 Datei zu groß
$ ENOSPC
@@ -72,11 +72,11 @@
$ EDOM
33 Numerisches Argument außerhalb des Wertebereichs
$ ERANGE
-34 Ergebnis zu groß
+34 Ergebnis außerhalb des Wertebereichs
$ EAGAIN, EWOULDBLOCK
35 Ressource vorübergehend nicht verfügbar
$ EINPROGRESS
-36 Operation wird jetzt ausgeführt
+36 Operation wird gerade ausgeführt
$ EALREADY
37 Operation wird bereits ausgeführt
$ ENOTSOCK
@@ -164,7 +164,7 @@
$ EFTYPE
79 Ungültiger Dateityp oder Dateiformat
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list