[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/03: Merge remote-tracking branch 'mainline/master' into dde
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/03: Merge remote-tracking branch 'mainline/master' into dde |
|
Date: |
Tue, 14 Jan 2014 01:59:56 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch dde
in repository hurd.
commit 7ea30aff0d525996a91d0ca4e0cf1a75f51e73d2
Merge: 8933e05 fc186a1
Author: Samuel Thibault <address@hidden>
Date: Sat Sep 21 14:29:15 2013 +0200
Merge remote-tracking branch 'mainline/master' into dde
Conflicts:
Makefile
ext2fs/hyper.c
libdiskfs/dir-lookup.c
libfshelp/Makefile
Makefile | 4 +-
NEWS | 16 +-
TODO | 21 +-
bsdfsck/Makefile | 30 -
bsdfsck/dir.c | 690 --------------
bsdfsck/fsck.h | 303 -------
bsdfsck/inode.c | 562 ------------
bsdfsck/main.c | 333 -------
bsdfsck/pass1.c | 331 -------
bsdfsck/pass1b.c | 100 --
bsdfsck/pass2.c | 441 ---------
bsdfsck/pass3.c | 72 --
bsdfsck/pass4.c | 134 ---
bsdfsck/pass5.c | 358 --------
bsdfsck/preen.c | 355 --------
bsdfsck/setup.c | 480 ----------
bsdfsck/utilities.c | 567 ------------
config.make.in | 13 +
configure.ac | 17 +-
console-client/Makefile | 4 +-
console-client/console.c | 115 ++-
console-client/pc-kbd.c | 2 +
console-client/pc-mouse.c | 2 +
console-client/vga-dynafont.c | 4 +-
console-client/xkb/kstoucs.c | 1 +
console/pager.c | 10 +-
daemons/console-run.c | 5 +-
daemons/runsystem.sh | 15 +-
doc/hurd.texi | 11 +-
doc/navigating | 6 +-
exec/Makefile | 12 +-
exec/exec.c | 933 ++-----------------
exec/hostarch.c | 2 +-
exec/main.c | 3 +-
exec/priv.h | 43 +-
ext2fs/balloc.c | 31 +-
ext2fs/dir.c | 4 +-
ext2fs/ext2fs.c | 6 +-
ext2fs/ext2fs.h | 145 ++-
ext2fs/getblk.c | 21 +-
ext2fs/hyper.c | 37 +-
ext2fs/ialloc.c | 37 +-
ext2fs/inode.c | 40 +-
ext2fs/pager.c | 467 +++++++++-
ext2fs/pokel.c | 39 +-
ext2fs/truncate.c | 9 +-
fatfs/pager.c | 11 +-
hurd/fsys.defs | 22 +-
hurd/fsys_reply.defs | 12 +-
hurd/process.defs | 32 +-
hurd/process_reply.defs | 134 ++-
hurd/process_request.defs | 33 +-
ufs/consts.c => include/pids.h | 32 +-
init/init.c | 24 +-
isofs/inode.c | 2 +-
isofs/lookup.c | 2 +-
isofs/pager.c | 15 +-
libdiskfs/Makefile | 5 +-
libdiskfs/boot-start.c | 3 +-
libdiskfs/dead-name.c | 4 +-
libdiskfs/dir-lookup.c | 31 +-
libdiskfs/dir-renamed.c | 2 +-
libdiskfs/disk-pager.c | 6 +-
libdiskfs/diskfs-pager.h | 3 +-
libdiskfs/diskfs.h | 11 +-
libdiskfs/file-set-trans.c | 21 +-
libdiskfs/fsys-get-children.c | 99 ++
libdiskfs/fsys-get-source.c | 34 +
libdiskfs/fsys-getroot.c | 3 +-
libdiskfs/get-source.c | 28 +
libdiskfs/init-startup.c | 10 +-
libdiskfs/peropen-make.c | 8 +
libdiskfs/peropen-rele.c | 1 +
libfshelp/Makefile | 3 +-
libfshelp/fshelp.h | 35 +-
libfshelp/set-options.c | 3 +-
libfshelp/translator-list.c | 170 ++++
libihash/ihash.h | 17 +
libiohelp/iouser-create.c | 3 +-
libnetfs/Makefile | 7 +-
{libdiskfs => libnetfs}/dead-name.c | 12 +-
libnetfs/dir-lookup.c | 26 +-
libnetfs/file-get-transcntl.c | 52 ++
libnetfs/file-get-translator.c | 14 +
libnetfs/file-set-translator.c | 19 +-
libnetfs/fsstubs.c | 8 -
libnetfs/fsys-get-children.c | 112 +++
libnetfs/fsys-get-source.c | 34 +
libnetfs/fsys-getroot.c | 6 +-
libnetfs/get-source.c | 28 +
libnetfs/init-startup.c | 14 +
libnetfs/make-peropen.c | 15 +-
libnetfs/netfs.h | 10 +-
libnetfs/release-peropen.c | 1 +
libpager/data-request.c | 3 +-
libpager/data-return.c | 79 +-
libpager/pager-create.c | 4 +-
libpager/pager.h | 23 +-
libpager/priv.h | 1 +
libpipe/pipe.c | 1 +
libps/write.c | 2 +-
libshouldbeinlibc/Makefile | 4 +-
libshouldbeinlibc/nullauth.c | 47 +
libshouldbeinlibc/nullauth.h | 31 +
libstore/Makefile | 4 -
{exec => libstore}/crypt.h | 0
{exec => libstore}/do-bunzip2.c | 0
{exec => libstore}/gzip.h | 0
{exec => libstore}/inflate.c | 0
{exec => libstore}/tailor.h | 0
{exec => libstore}/unzip.c | 0
{exec => libstore}/util.c | 0
libtrivfs/Makefile | 5 +-
libtrivfs/fsys-get-children.c | 35 +
libtrivfs/fsys-get-source.c | 33 +
libtrivfs/get-source.c | 28 +
libtrivfs/io-restrict-auth.c | 4 +-
libtrivfs/startup.c | 19 +
libtrivfs/trivfs.h | 8 +-
mach-defpager/main.c | 13 +
pfinet/linux-src/net/ipv4/ipmr.c | 2 +-
pfinet/main.c | 3 +-
pfinet/tunnel.c | 13 +-
pflocal/io.c | 20 +-
pflocal/sock.c | 28 +-
pflocal/sock.h | 10 +-
pflocal/socket.c | 16 +-
proc/exc-reply.defs | 36 -
proc/info.c | 2 +-
proc/main.c | 3 +-
proc/mgt.c | 77 +-
proc/pgrp.c | 7 +-
proc/proc.h | 6 +-
storeio/pager.c | 9 +-
sutils/MAKEDEV.sh | 2 +-
sutils/fstab.c | 117 +--
sutils/swapon.c | 23 +-
term/hurdio.c | 2 +-
term/users.c | 6 +-
tmpfs/pager-stubs.c | 8 +
tmpfs/tmpfs.c | 6 +
trans/Makefile | 6 +-
trans/mtab.c | 800 ++++++++++++++++
trans/null.c | 5 +
trans/symlink.c | 28 +
ufs-fsck/Makefile | 33 -
ufs-fsck/dir.c | 567 ------------
ufs-fsck/fsck.h | 183 ----
ufs-fsck/inode.c | 203 -----
ufs-fsck/main.c | 170 ----
ufs-fsck/pass1.c | 437 ---------
ufs-fsck/pass1b.c | 90 --
ufs-fsck/pass2.c | 400 --------
ufs-fsck/pass3.c | 71 --
ufs-fsck/pass4.c | 94 --
ufs-fsck/pass5.c | 450 ---------
ufs-fsck/setup.c | 191 ----
ufs-fsck/utilities.c | 455 ----------
ufs-utils/Makefile | 38 -
ufs-utils/clri.c | 168 ----
ufs-utils/dlabel.c | 91 --
ufs-utils/mkfs.c | 1406 -----------------------------
ufs-utils/newfs.c | 705 ---------------
ufs-utils/stati.c | 260 ------
ufs/Makefile | 32 -
ufs/alloc.c | 1703 -----------------------------------
ufs/bmap.c | 120 ---
ufs/dinode.h | 137 ---
ufs/dir.c | 988 --------------------
ufs/dir.h | 163 ----
ufs/fs.h | 509 -----------
ufs/hyper.c | 414 ---------
ufs/inode.c | 705 ---------------
ufs/main.c | 210 -----
ufs/pager.c | 831 -----------------
ufs/pokeloc.c | 85 --
ufs/sizes.c | 736 ---------------
ufs/subr.c | 264 ------
ufs/tables.c | 138 ---
ufs/ufs.h | 310 -------
ufs/xinl.c | 2 -
utils/Makefile | 13 +-
utils/fakeroot.sh | 10 +-
utils/match-options.c | 68 ++
utils/match-options.h | 33 +
utils/mount.c | 122 ++-
utils/nullauth.c | 90 ++
utils/remap.sh | 8 +-
utils/rpctrace.c | 2 +-
utils/umount.c | 357 ++++++++
190 files changed, 4160 insertions(+), 19489 deletions(-)
diff --cc Makefile
index 562cf21,818826f..e0328b3
--- a/Makefile
+++ b/Makefile
@@@ -37,8 -36,8 +37,8 @@@ prog-subdirs = auth proc exec init ter
storeio pflocal pfinet defpager mach-defpager \
login daemons boot console \
hostmux usermux ftpfs trans \
- console-client utils sutils ufs-fsck ufs-utils \
+ console-client utils sutils \
- benchmarks fstests
+ benchmarks fstests eth-multiplexer proc_proxy devnode
ifeq ($(HAVE_SUN_RPC),yes)
prog-subdirs += nfs nfsd
diff --cc libdiskfs/dir-lookup.c
index fa7c5e6,15a9b0c..e566a10
--- a/libdiskfs/dir-lookup.c
+++ b/libdiskfs/dir-lookup.c
@@@ -489,8 -485,25 +495,24 @@@ diskfs_S_dir_lookup (struct protid *dir
if (! error)
{
+ free (newpi->po->path);
+ if (dircred->po->path == NULL)
+ {
+ /* dircred is the root directory. */
+ newpi->po->path = relpath;
+ relpath = NULL; /* Do not free relpath. */
+ }
+ else
+ {
+ newpi->po->path = NULL;
+ asprintf (&newpi->po->path, "%s/%s", dircred->po->path, relpath);
+ }
+
+ if (! newpi->po->path)
+ error = errno;
+
*returned_port = ports_get_right (newpi);
ports_port_deref (newpi);
- newpi = 0;
}
out:
diff --cc libfshelp/Makefile
index fdfc178,6ba6a14..9d87536
--- a/libfshelp/Makefile
+++ b/libfshelp/Makefile
@@@ -20,7 -20,7 +20,8 @@@ makemode := librar
libname = libfshelp
SRCS = lock-acquire.c lock-init.c \
+ service-fsys-startup.c \
+ translator-list.c \
start-translator-long.c start-translator.c \
fetch-root.c transbox-init.c set-active.c fetch-control.c \
drop-transbox.c translated.c \
diff --cc libnetfs/dir-lookup.c
index 37db5e7,10ea2d0..3003eef
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@@ -390,8 -397,23 +397,24 @@@ netfs_S_dir_lookup (struct protid *diru
goto out;
}
+ free (newpi->po->path);
+ if (diruser->po->path == NULL)
+ {
+ /* diruser is the root directory. */
+ newpi->po->path = relpath;
+ relpath = NULL; /* Do not free relpath. */
+ }
+ else
+ {
+ newpi->po->path = NULL;
+ asprintf (&newpi->po->path, "%s/%s", diruser->po->path, relpath);
+ }
+
+ if (! newpi->po->path)
+ error = errno;
+
*retry_port = ports_get_right (newpi);
+ fprintf (stderr, "dereference a port\n");
ports_port_deref (newpi);
out:
diff --cc trans/Makefile
index 924c33c,291df2f..fa28e46
--- a/trans/Makefile
+++ b/trans/Makefile
@@@ -20,13 -20,14 +20,14 @@@ dir := tran
makemode := servers
targets = symlink firmlink ifsock magic null fifo new-fifo fwd crash \
- password hello hello-mt streamio fakeroot proxy-defpager remap
+ password hello hello-mt streamio fakeroot proxy-defpager remap \
+ mtab
SRCS = ifsock.c symlink.c magic.c null.c fifo.c new-fifo.c fwd.c \
crash.c firmlink.c password.c hello.c hello-mt.c streamio.c \
- fakeroot.c proxy-defpager.c remap.c
+ fakeroot.c proxy-defpager.c remap.c mtab.c
OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \
crashServer.o crash_replyUser.o msgServer.o \
- default_pagerServer.o default_pagerUser.o \
+ ourdefault_pagerServer.o ourdefault_pagerUser.o \
device_replyServer.o elfcore.o
HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc
LDLIBS += -lpthread
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git