search for: guestfsd_sourc

...c88 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -76,7 +76,11 @@ else noinst_PROGRAMS = guestfsd endif +# Compile the largest file (stubs.c) first. The other files are +# listed alphabetically. See also: +# https://rwmj.wordpress.com/2015/09/30/make-and-queuing-theory/#content guestfsd_SOURCES = \ + stubs.c \ 9p.c \ acl.c \ actions.h \ @@ -162,7 +166,6 @@ guestfsd_SOURCES = \ stat.c \ statvfs.c \ strings.c \ - stubs.c \ swap.c \ sync.c \ syslinux.c \ -- 2.5.0

...2017 14:37:10 CET Richard W.M. Jones wrote: > This commit, which is just code motion, moves the common XDR protocol > code (libprotocol) and the common errno handling (liberrnostring) into > libraries which are each built once and shared between the library and > daemon. > --- > guestfsd_SOURCES = \ > + ../common/errnostring/errnostring.h \ > + ../common/protocol/guestfs_protocol.h \ > [...] > libguestfs_la_SOURCES = \ > + ../common/errnostring/errnostring.h \ > + ../common/protocol/guestfs_protocol.h \ Are these two changes needed? The targets already depend on the...

...| 7 +++++ 6 files changed, 121 insertions(+), 1 deletions(-) create mode 100644 daemon/echo_daemon.c create mode 100644 daemon/m4/stddef_h.m4 diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 83ee408..ae74699 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -36,6 +36,7 @@ guestfsd_SOURCES = \ dmesg.c \ dropcaches.c \ du.c \ + echo_daemon.c \ ext2.c \ fallocate.c \ file.c \ diff --git a/daemon/echo_daemon.c b/daemon/echo_daemon.c new file mode 100644 index 0000000..dbede2f --- /dev/null +++ b/daemon/echo_daemon.c @@ -0,0 +1,66 @@ +/* libguestfs - the guestfsd daemon + *...

..._actions.ml | 6 ++++ src/MAX_PROC_NR | 2 +- 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 daemon/xfs.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9e2a633..afe8874 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -165,6 +165,7 @@ guestfsd_SOURCES = \ utimens.c \ wc.c \ xattr.c \ + xfs.c \ zero.c \ zerofree.c guestfsd_LDADD = \ diff --git a/daemon/xfs.c b/daemon/xfs.c new file mode 100644 index 0000000..8b60b19 --- /dev/null +++ b/daemon/xfs.c @@ -0,0 +1,69 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2012 Fujitsu L...

...h.m4 +m4/wchar.m4 +m4/wchar_t.m4 +m4/wint_t.m4 +m4/xalloc.m4 +tests diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0fec611..090338d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -17,6 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = lib tests . + noinst_PROGRAMS = guestfsd guestfsd_SOURCES = \ actions.h \ @@ -75,8 +77,8 @@ guestfsd_SOURCES = \ zero.c \ zerofree.c \ $(top_builddir)/../src/guestfs_protocol.h \ - $(top_builddir)/../src/guestfs_protocol.c \ - $(srcdir)/../.gnulib/lib/hash.h \ - $(srcdir)/../.gnulib/lib/hash.c + $(top_builddir)/../src/guestfs_protocol.c -guestf...

...t.c | 2 +- docs/C_SOURCE_FILES | 1 - generator/daemon.ml | 8 +++---- 15 files changed, 53 insertions(+), 201 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0d3dde516..db19594b8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -49,6 +49,8 @@ endif guestfsd_SOURCES = \ ../common/errnostring/errnostring.h \ ../common/protocol/guestfs_protocol.h \ + ../common/utils/cleanups.h \ + ../common/utils/utils.h \ 9p.c \ acl.c \ actions.h \ @@ -62,7 +64,6 @@ guestfsd_SOURCES = \ cap.c \ checksum.c \ cleanups.c \ - cleanups.h \ cmp.c \ command.c \...

...------------------- 3 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 daemon/sleuthkit.c delete mode 100644 daemon/tsk.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 4e2051b..beb7962 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -171,6 +171,7 @@ guestfsd_SOURCES = \ sfdisk.c \ sh.c \ sleep.c \ + sleuthkit.c \ stat.c \ statvfs.c \ strings.c \ @@ -179,7 +180,6 @@ guestfsd_SOURCES = \ syslinux.c \ tar.c \ truncate.c \ - tsk.c \ umask.c \ upload.c \ utimens.c \ diff --git a/daemon/sleuthkit.c b/daemon/sleuthkit.c new file mode 100644...

...ns.h \ + stubs.c \ + names.c + +.PHONY: force + +$(GENERATOR_ML): force + $(MAKE) -C $(libsrcdir) stamp-generator + +BUILT_SOURCES = $(GENERATOR_ML) + +EXTRA_DIST = $(BUILT_SOURCES) + +$(libsrcdir)/guestfs_protocol.o: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.o + noinst_PROGRAMS = guestfsd guestfsd_SOURCES = \ actions.h \ @@ -83,11 +102,8 @@ guestfsd_SOURCES = \ wc.c \ xattr.c \ zero.c \ - zerofree.c \ - $(top_builddir)/../src/guestfs_protocol.h \ - $(top_builddir)/../src/guestfs_protocol.c + zerofree.c +guestfsd_LDADD = $(libsrcdir)/guestfs_protocol.o lib/libgnu.a AM_CPPFLAGS = -I$(srcd...

...to make the toplevel configure.ac into something which is Win32-friendly. I'm not sure what a good way to solve this is though. My thoughts: (a) Copy guestfs_protocol.[ch] into the daemon and treat it totally separately. (b) Revert the change so we're building again with a rule like: guestfsd_SOURCES = ../src/guestfs_protocol.c \ ../src/guestfs_protocol.h \ #... I think the change was made originally to support parallel makes, so I don't know if doing this will break parallel makes again. (c) Something else ...? Is there a way to tell automake to put the object file into th...

...AX_PROC_NR | 2 +- src/generator.ml | 7 +++++++ 5 files changed, 53 insertions(+), 1 deletions(-) create mode 100644 daemon/modprobe.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 097d89d..83ee408 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -54,6 +54,7 @@ guestfsd_SOURCES = \ lvm.c \ mkfs.c \ mknod.c \ + modprobe.c \ mount.c \ names.c \ ntfs.c \ diff --git a/daemon/modprobe.c b/daemon/modprobe.c new file mode 100644 index 0000000..8f92eca --- /dev/null +++ b/daemon/modprobe.c @@ -0,0 +1,43 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2009...

...| 2 +- > 7 files changed, 141 insertions(+), 1 deletion(-) > create mode 100644 daemon/fs-min-size.c > > diff --git a/daemon/Makefile.am b/daemon/Makefile.am > index 4ea3c88..0a01a24 100644 > --- a/daemon/Makefile.am > +++ b/daemon/Makefile.am > @@ -116,6 +116,7 @@ guestfsd_SOURCES = \ > findfs.c \ > fill.c \ > find.c \ > + fs-min-size.c \ Hm not really convinced by the file name chosen, but I cannot find better options. "size.c"? "fs-size.c"? > fsck.c \ > fstrim.c \ > glob.c \ > diff --git a/daemon/daemon.h b/daemon...

...tructs-cleanups.c \ + structs-cleanups.h \ + stubs-0.c \ + stubs-1.c \ + stubs-2.c \ + stubs-3.c \ + stubs-4.c \ + stubs-5.c \ + stubs-6.c \ + stubs.h EXTRA_DIST = \ - $(BUILT_SOURCES) \ + $(generator_built) \ + $(SOURCES_MLI) $(SOURCES_ML) \ guestfsd.pod if INSTALL_DAEMON @@ -61,6 +79,7 @@ guestfsd_SOURCES = \ blkid.c \ blockdev.c \ btrfs.c \ + caml-stubs.c \ cap.c \ checksum.c \ cleanups.c \ @@ -71,6 +90,7 @@ guestfsd_SOURCES = \ copy.c \ cpio.c \ cpmv.c \ + daemon-c.c \ daemon.h \ dd.c \ debug.c \ @@ -161,6 +181,7 @@ guestfsd_SOURCES = \ swap.c \ sync.c \ syslinux.c...

...po/POTFILES | 1 + src/MAX_PROC_NR | 2 +- 5 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 daemon/tsk.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index caba83e..4e2051b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -179,6 +179,7 @@ guestfsd_SOURCES = \ syslinux.c \ tar.c \ truncate.c \ + tsk.c \ umask.c \ upload.c \ utimens.c \ diff --git a/daemon/tsk.c b/daemon/tsk.c new file mode 100644 index 0000000..647d1e7 --- /dev/null +++ b/daemon/tsk.c @@ -0,0 +1,114 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2016 Red Hat...

...= \ - errnostring-gperf.c \ - errnostring.h \ - errnostring.c -liberrnostring_a_CFLAGS = - -errnostring-gperf.c: errnostring-gperf.gperf - rm -f $@ - $(GPERF) -t $< > $@-t - mv $@-t $@ - if INSTALL_DAEMON sbin_PROGRAMS = guestfsd else @@ -83,6 +44,8 @@ noinst_PROGRAMS = guestfsd endif guestfsd_SOURCES = \ + ../common/errnostring/errnostring.h \ + ../common/protocol/guestfs_protocol.h \ 9p.c \ acl.c \ actions.h \ @@ -204,8 +167,8 @@ guestfsd_SOURCES = \ zerofree.c guestfsd_LDADD = \ - liberrnostring.a \ - libprotocol.a \ + ../common/errnostring/liberrnostring.la \ + ../common/protoco...

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

This patch series is just FYI at the moment. However it does pass the tests. The daemon is a self-contained program. We don't need to write it all in C. Writing parts of it in OCaml would make it simpler and less error-prone. In particular if the daemon was written in a more sane programming language then we could move the inspection code to run entirely inside the appliance, which would

...OTFILES | 1 + src/MAX_PROC_NR | 2 +- 7 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 daemon/fs-min-size.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 4ea3c88..0a01a24 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -116,6 +116,7 @@ guestfsd_SOURCES = \ findfs.c \ fill.c \ find.c \ + fs-min-size.c \ fsck.c \ fstrim.c \ glob.c \ diff --git a/daemon/daemon.h b/daemon/daemon.h index 508691a..8287a99 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -283,6 +283,7 @@ extern int btrfs_set_uuid_random (const char *device); /*-- in...

...POTFILES | 2 +- 4 files changed, 321 insertions(+), 321 deletions(-) delete mode 100644 daemon/command.c create mode 100644 daemon/sh.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 8055235..c1a33e3 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -96,7 +96,6 @@ guestfsd_SOURCES = \ cap.c \ checksum.c \ cmp.c \ - command.c \ compress.c \ copy.c \ cpio.c \ @@ -166,6 +165,7 @@ guestfsd_SOURCES = \ scrub.c \ selinux.c \ sfdisk.c \ + sh.c \ sleep.c \ stat.c \ statvfs.c \ diff --git a/daemon/command.c b/daemon/command.c deleted file mode 100644 index c...

...n @@ -43,6 +43,7 @@ ifelse(REDHAT,1, ntfs-3g openssh-clients pcre + policycoreutils reiserfs-utils libselinux syslinux-extlinux diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b77d1e7..9bd495f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -168,6 +168,7 @@ guestfsd_SOURCES = \ rsync.c \ scrub.c \ selinux.c \ + setfiles.c \ sfdisk.c \ sh.c \ sleep.c \ diff --git a/daemon/setfiles.c b/daemon/setfiles.c new file mode 100644 index 0000000..3f249c3 --- /dev/null +++ b/daemon/setfiles.c @@ -0,0 +1,93 @@ +/* libguestfs - the guestfsd daemon + * Copyright (C) 2...

...OTFILES | 1 + src/MAX_PROC_NR | 2 +- 7 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 daemon/fs-min-size.c diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 4ea3c88..0a01a24 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -116,6 +116,7 @@ guestfsd_SOURCES = \ findfs.c \ fill.c \ find.c \ + fs-min-size.c \ fsck.c \ fstrim.c \ glob.c \ diff --git a/daemon/daemon.h b/daemon/daemon.h index 508691a..a690152 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -283,6 +283,7 @@ extern int btrfs_set_uuid_random (const char *device); /*-- in...