RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rc Date: 09-May-2009 20:49:27
Branch: HEAD Handle: 2009050918492600
Added files:
rc rc.c
Modified files:
rc .cvsignore Makefile.am configure.ac main.c
Log:
- rc: prepare rc for embedding.
Summary:
Revision Changes Path
1.3 +5 -0 rc/.cvsignore
1.2 +23 -18 rc/Makefile.am
1.2 +1 -0 rc/configure.ac
1.2 +1 -1 rc/main.c
1.1 +8 -0 rc/rc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rc/.cvsignore
============================================================================
$ cvs diff -u -r1.2 -r1.3 .cvsignore
--- rc/.cvsignore 9 May 2009 17:35:28 -0000 1.2
+++ rc/.cvsignore 9 May 2009 18:49:26 -0000 1.3
@@ -2,6 +2,11 @@
.depend
.depend-done
.libs
+*.gcda
+*.gcno
+*.la
+*.lcd
+*.lo
Makefile
Makefile.in
aclocal.m4
@@ .
patch -p0 <<'@@ .'
Index: rc/Makefile.am
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 Makefile.am
--- rc/Makefile.am 9 May 2009 14:06:07 -0000 1.1.1.1
+++ rc/Makefile.am 9 May 2009 18:49:26 -0000 1.2
@@ -1,49 +1,54 @@
## Process this file with automake to produce Makefile.in
if AMC_HISTORY
-man_MANS = rc.1 history.1
+dist_noinst__MANS = rc.1 history.1
HISTORY = history
else
-man_MANS = rc.1
+dist_noinst_MANS = rc.1
endif
if AMC_NO_HASHBANG
-EXECVE = execve.o
+EXECVE = execve.c
endif
if AMC_READLINE
-READLINE = readline.o
+READLINE = readline.c
endif
if AMC_RESTART
-SYSTEM = system-bsd.o
+SYSTEM = system-bsd.c
else
-SYSTEM = system.o
+SYSTEM = system.c
endif
-bin_PROGRAMS = rc
-noinst_PROGRAMS = mksignal mkstatval tripping $(HISTORY)
+# XXX FIXME: @USRLIBRPM@ needs to be used instead.
+pkglibdir = /usr/lib/rpm/lib
+pkgbindir = /usr/lib/rpm/bin
+
+pkgbin_PROGRAMS = rc
+pkglib_LTLIBRARIES = librc.la
-rc_SOURCES = builtins.c except.c exec.c fn.c footobar.c getopt.c glob.c
glom.c hash.c heredoc.c input.c lex.c list.c main.c match.c nalloc.c open.c
parse.c print.c redir.c signal.c status.c tree.c utils.c var.c wait.c walk.c
which.c
+noinst_PROGRAMS = mksignal mkstatval tripping $(HISTORY)
-EXTRA_rc_SOURCES = addon.c execve.c readline.c system.c system-bsd.c
+librc_la_SOURCES = \
+ sigmsgs.c addon.c $(EXECVE) $(READLINE) $(SYSTEM) \
+ builtins.c except.c exec.c fn.c footobar.c getopt.c glob.c \
+ glom.c hash.c heredoc.c input.c lex.c list.c main.c match.c \
+ nalloc.c open.c parse.c print.c redir.c signal.c status.c \
+ tree.c utils.c var.c wait.c walk.c which.c
-rc_DEPENDENCIES = sigmsgs.o $(ADDON) $(EXECVE) $(READLINE) $(SYSTEM)
-rc_LDADD = sigmsgs.o $(ADDON) $(EXECVE) $(READLINE) $(SYSTEM)
+rc_SOURCES = rc.c
+rc_LDADD = librc.la
-noinst_HEADERS = getgroups.h jbwrap.h parse.h proto.h rc.h rlimit.h stat.h
wait.h
+noinst_HEADERS = statval.h getgroups.h jbwrap.h parse.h proto.h rc.h
rlimit.h stat.h wait.h
-BUILT_SOURCES = sigmsgs.c
+BUILT_SOURCES = sigmsgs.c statval.h
EXTRA_DIST = EXAMPLES RELDATE addon.c addon.h history.1 parse.y rc.1 trip.rc
sigmsgs.c sigmsgs.h: mksignal
./mksignal
-# Newer automake's buildtime dependency tracking can't seem to figure
-# this one out.
-status.o: statval.h
-
statval.h: mkstatval
./mkstatval > statval.h
@@ .
patch -p0 <<'@@ .'
Index: rc/configure.ac
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 configure.ac
--- rc/configure.ac 9 May 2009 14:06:09 -0000 1.1.1.1
+++ rc/configure.ac 9 May 2009 18:49:26 -0000 1.2
@@ -27,6 +27,7 @@
AC_SYS_LARGEFILE
AC_PROG_CPP
+AC_PROG_LIBTOOL
AC_CHECK_PROGS(LN, ln cp)
AC_CHECK_HEADERS(sys/resource.h sys/time.h sys/types.h unistd.h)
@@ .
patch -p0 <<'@@ .'
Index: rc/main.c
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 main.c
--- rc/main.c 9 May 2009 14:06:06 -0000 1.1.1.1
+++ rc/main.c 9 May 2009 18:49:26 -0000 1.2
@@ -11,7 +11,7 @@
static void assigndefault(char *,...);
static void checkfd(int, enum redirtype);
-extern int main(int argc, char *argv[], char *envp[]) {
+extern int rc_main(int argc, char *argv[], char *envp[]) {
char *dashsee[2], *dollarzero, *null[1];
int c;
initprint();
@@ .
patch -p0 <<'@@ .'
Index: rc/rc.c
============================================================================
$ cvs diff -u -r0 -r1.1 rc.c
--- /dev/null 2009-05-09 20:45:19 +0200
+++ rc.c 2009-05-09 20:49:27 +0200
@@ -0,0 +1,8 @@
+/* main.c: handles initialization of rc and command line options */
+
+extern int rc_main(int argc, char *argv[], char *envp[]);
+
+int main(int argc, char *argv[], char *envp[])
+{
+ return rc_main(argc, argv, envp);
+}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
