oweals/busybox.git
23 years agodpkg_deb had not been updated for the new gunzip interface. Fix it.
Eric Andersen [Thu, 5 Apr 2001 06:04:11 +0000 (06:04 -0000)]
dpkg_deb had not been updated for the new gunzip interface.  Fix it.
 -Erik

23 years agoA number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few
Eric Andersen [Thu, 5 Apr 2001 03:14:39 +0000 (03:14 -0000)]
A number of cleanups.  Now compiles with libc5, glibc, and uClibc.  Fix a few
shadowed variables.  Move (almost) all syscalls to libbb/syscalls.c, so I can
handle them sanely and all at once.
 -Erik

23 years agoPatch from Larry Doolittle to eliminate needless thrashing
Eric Andersen [Wed, 4 Apr 2001 22:49:01 +0000 (22:49 -0000)]
Patch from Larry Doolittle to eliminate needless thrashing
about when trimming long strings with lots of trailing white
space.

23 years agoRemove unused optarg variable
Eric Andersen [Wed, 4 Apr 2001 19:33:32 +0000 (19:33 -0000)]
Remove unused optarg variable

23 years agoFailed to name "Electric-fence" explicitly
Eric Andersen [Wed, 4 Apr 2001 19:32:00 +0000 (19:32 -0000)]
Failed to name "Electric-fence" explicitly

23 years agoSome cleanups for libc5 support
Eric Andersen [Wed, 4 Apr 2001 19:29:48 +0000 (19:29 -0000)]
Some cleanups for libc5 support

23 years agoFix a warning with libc5.
Eric Andersen [Wed, 4 Apr 2001 19:26:22 +0000 (19:26 -0000)]
Fix a warning with libc5.
 -Erik

23 years agoSeems that stupid libc5 doesn't implement daemon(), so conditionally
Eric Andersen [Wed, 4 Apr 2001 19:25:57 +0000 (19:25 -0000)]
Seems that stupid libc5 doesn't implement daemon(), so conditionally
inclde that here.
 -Erik

23 years agoAvoid segfault when export is invoked with no arguments. Thanks to
Matt Kraai [Wed, 4 Apr 2001 17:50:04 +0000 (17:50 -0000)]
Avoid segfault when export is invoked with no arguments.  Thanks to
Gennady Feldman.

23 years agoI said no new features till after the 0.51 release. Well, I lied. This is a
Eric Andersen [Wed, 4 Apr 2001 17:31:15 +0000 (17:31 -0000)]
I said no new features till after the 0.51 release.  Well, I lied.  This is a
vi editor for busybox, contributed by Sterling Huxley <sterling@europa.com>.
It adds 22k to the busybox binary when enabled.  Quite impressive!

23 years agoPlace a temporary bandaid on the ls/du/df human-readable issue. This method is
Eric Andersen [Tue, 3 Apr 2001 23:14:29 +0000 (23:14 -0000)]
Place a temporary bandaid on the ls/du/df human-readable issue.  This method is
not going to scale up as well as I would like, and Matt Kraai and I have
discussed a better long term solution.  But for now this will at least make all
the human-readable apps give correct answers.

Please test the human readable/non-human readable options on your systems!!!
 -Erik

23 years agoAdd in easy-to-use electric-fence support.
Eric Andersen [Tue, 3 Apr 2001 22:53:19 +0000 (22:53 -0000)]
Add in easy-to-use electric-fence support.
 -Erik

23 years agoif strlen(s) was 0, it would then end up using s[-1] as an array index. Bad,
Eric Andersen [Tue, 3 Apr 2001 22:50:52 +0000 (22:50 -0000)]
if strlen(s) was 0, it would then end up using s[-1] as an array index.  Bad,
bad, bad.  This was crashing the shell on powerpc boxes, though all other archs
seem to have a much more forgiving malloc implementations.  I finally found
this bug using electric-fence on a powerpc box.
 -Erik

23 years agoA patch from Matt Kraai that adds a new 'shutdown' action to busybox init. Now
Eric Andersen [Tue, 3 Apr 2001 18:01:51 +0000 (18:01 -0000)]
A patch from Matt Kraai that adds a new 'shutdown' action to busybox init.  Now
you can specify an arbitrary behavior for 'ctrlaltdel' without that behavior
needing to be a reboot.

23 years agoMake 'busybox --help' work as expected, closing bug #1139
Eric Andersen [Tue, 3 Apr 2001 17:05:01 +0000 (17:05 -0000)]
Make 'busybox --help' work as expected, closing bug #1139
 -Erik

23 years agoFix for bug 1143 from Larry Doolittle
Eric Andersen [Tue, 3 Apr 2001 16:38:37 +0000 (16:38 -0000)]
Fix for bug 1143 from Larry Doolittle
 -Erik

23 years agoMove the mtab support stuff into libbb
Eric Andersen [Sun, 1 Apr 2001 16:01:11 +0000 (16:01 -0000)]
Move the mtab support stuff into libbb
 -Erik

23 years agoFormatting change
Eric Andersen [Sun, 1 Apr 2001 04:49:41 +0000 (04:49 -0000)]
Formatting change

23 years agoDont try and automount devfs, rename some variables
Glenn L McGrath [Fri, 30 Mar 2001 01:28:13 +0000 (01:28 -0000)]
Dont try and automount devfs, rename some variables

23 years agoAdd in a new standalone env applet for fixing up app's environments
Eric Andersen [Thu, 29 Mar 2001 22:48:33 +0000 (22:48 -0000)]
Add in a new standalone env applet for fixing up app's environments
 -Erik

23 years agoUse daemon() to spawn syslogd and klogd daemons.
Eric Andersen [Thu, 29 Mar 2001 21:58:33 +0000 (21:58 -0000)]
Use daemon() to spawn syslogd and klogd daemons.
 -Erik

23 years agogz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
Eric Andersen [Thu, 29 Mar 2001 14:22:45 +0000 (14:22 -0000)]
gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
Fix that.

23 years agoFix zcat
Glenn L McGrath [Thu, 29 Mar 2001 01:07:54 +0000 (01:07 -0000)]
Fix zcat

23 years agogunzip -c works again
Glenn L McGrath [Thu, 29 Mar 2001 00:57:20 +0000 (00:57 -0000)]
gunzip -c works again

23 years agoFixes from Robert Kaiser
Glenn L McGrath [Wed, 28 Mar 2001 23:57:51 +0000 (23:57 -0000)]
Fixes from Robert Kaiser

23 years agoApplied patch from David Douthitt to re-add -print option to find.
Mark Whitley [Wed, 28 Mar 2001 22:04:42 +0000 (22:04 -0000)]
Applied patch from David Douthitt to re-add -print option to find.
Closes bug #1144.

23 years agoFix ls so it uses make_human_readable_str() the same way already
Eric Andersen [Wed, 28 Mar 2001 20:26:51 +0000 (20:26 -0000)]
Fix ls so it uses make_human_readable_str() the same way already
used by 'du' and 'df'.  Now we just need to fix make_human_readable_str
so it behaves they way it used to before Matt fixed it.

23 years agoPatch bass ackwards behavior of hr flag.
Matt Kraai [Wed, 28 Mar 2001 20:10:25 +0000 (20:10 -0000)]
Patch bass ackwards behavior of hr flag.

23 years agoRewrite to fix bug #1140 and make it slightly smaller.
Matt Kraai [Wed, 28 Mar 2001 16:42:27 +0000 (16:42 -0000)]
Rewrite to fix bug #1140 and make it slightly smaller.

23 years agoEnable tar -z support again by default
Glenn L McGrath [Wed, 28 Mar 2001 07:48:10 +0000 (07:48 -0000)]
Enable tar -z support again by default

23 years agoRemove cruft
Glenn L McGrath [Wed, 28 Mar 2001 07:37:48 +0000 (07:37 -0000)]
Remove cruft

23 years agoRemove tar_unzip_init() not needed any more, uses gz_open instead
Glenn L McGrath [Wed, 28 Mar 2001 07:31:37 +0000 (07:31 -0000)]
Remove tar_unzip_init() not needed any more, uses gz_open instead

23 years agoFix tar -z, calls gz_open now
Glenn L McGrath [Wed, 28 Mar 2001 07:27:26 +0000 (07:27 -0000)]
Fix tar -z, calls gz_open now

23 years agoDisable tar -z for now
Glenn L McGrath [Wed, 28 Mar 2001 06:13:15 +0000 (06:13 -0000)]
Disable tar -z for now

23 years agoGunzip changes broke tar -z support (woops)
Glenn L McGrath [Wed, 28 Mar 2001 05:47:26 +0000 (05:47 -0000)]
Gunzip changes broke tar -z support (woops)

23 years agoMajor cleanup to better adhere to style guide and use standard busybox functions
Glenn L McGrath [Wed, 28 Mar 2001 05:38:24 +0000 (05:38 -0000)]
Major cleanup to better adhere to style guide and use standard busybox functions

23 years agoAdd functions that were shared with gunzip.c, gunzip about to change.
Glenn L McGrath [Wed, 28 Mar 2001 05:35:16 +0000 (05:35 -0000)]
Add functions that were shared with gunzip.c, gunzip about to change.

23 years agoChange BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).
Matt Kraai [Tue, 27 Mar 2001 21:57:29 +0000 (21:57 -0000)]
Change BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).

23 years agoSome more words on sending patches to the bug-tracker.
Mark Whitley [Tue, 27 Mar 2001 21:20:05 +0000 (21:20 -0000)]
Some more words on sending patches to the bug-tracker.

23 years agoApplied patch from David Douthitt to fix problem where ls reports half the
Mark Whitley [Tue, 27 Mar 2001 20:59:14 +0000 (20:59 -0000)]
Applied patch from David Douthitt to fix problem where ls reports half the
file size. Should close bug #1140.

23 years agoSome more tests for cut. Craig Matsuura said he saw some problems along these
Mark Whitley [Tue, 27 Mar 2001 20:48:01 +0000 (20:48 -0000)]
Some more tests for cut. Craig Matsuura said he saw some problems along these
lines. "Works for me", but we'll keep these tests around for regression.

23 years agoApplied patch from Gennady Feldman to fix a single-threaded syslogd bug that
Mark Whitley [Tue, 27 Mar 2001 20:17:58 +0000 (20:17 -0000)]
Applied patch from Gennady Feldman to fix a single-threaded syslogd bug that
turned up. This code needs to be tested on an embedded system, since that's
where the bug turned up in the first place.

23 years agoFixed the Makefile so busybox can link against libc5 again. Putting libbb.a at
Mark Whitley [Tue, 27 Mar 2001 18:22:41 +0000 (18:22 -0000)]
Fixed the Makefile so busybox can link against libc5 again. Putting libbb.a at
the end broke it.

23 years agoIn fact, socklen_t *is* defined by libc5.
Mark Whitley [Tue, 27 Mar 2001 18:22:00 +0000 (18:22 -0000)]
In fact, socklen_t *is* defined by libc5.

23 years agoFix to last patch: locale code should be 9, not 7.
Mark Whitley [Tue, 27 Mar 2001 17:07:15 +0000 (17:07 -0000)]
Fix to last patch: locale code should be 9, not 7.

23 years agoApplied patch from Vladimir N. Oleynik to add locale support to the shell per
Mark Whitley [Tue, 27 Mar 2001 16:35:16 +0000 (16:35 -0000)]
Applied patch from Vladimir N. Oleynik to add locale support to the shell per
bug report from Ralph Jones.

23 years agoApplied patch from Anthony Towns that he posted to Debian bug tracking.
Mark Whitley [Mon, 26 Mar 2001 16:47:57 +0000 (16:47 -0000)]
Applied patch from Anthony Towns that he posted to Debian bug tracking.

23 years agoFix in_ether bug regarding hex digits reported by Jonas Holmberg <jonas.holmberg...
Manuel Novoa III [Mon, 26 Mar 2001 16:26:16 +0000 (16:26 -0000)]
Fix in_ether bug regarding hex digits reported by Jonas Holmberg <jonas.holmberg@axis.com>.

23 years agoBump version number to 0.51pre
Eric Andersen [Sat, 24 Mar 2001 06:34:59 +0000 (06:34 -0000)]
Bump version number to 0.51pre

23 years agoxstrdup xargs cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:11:22 +0000 (17:11 -0000)]
xstrdup xargs cleanup from Jeff Garzik

23 years agoxstrdup tftp cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:10:19 +0000 (17:10 -0000)]
xstrdup tftp cleanup from Jeff Garzik

23 years agoPatch to use xfopen from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:09:15 +0000 (17:09 -0000)]
Patch to use xfopen from Jeff Garzik

23 years ago-Wshadow tr fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:08:21 +0000 (17:08 -0000)]
-Wshadow tr fix from Jeff Garzik

23 years ago-Wshadow sh fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:06:01 +0000 (17:06 -0000)]
-Wshadow sh fix from Jeff Garzik

23 years ago-Wshadow logread fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:04:47 +0000 (17:04 -0000)]
-Wshadow logread fix from Jeff Garzik

23 years ago-Wshadow loadacm fix from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:03:28 +0000 (17:03 -0000)]
-Wshadow loadacm fix from Jeff Garzik

23 years agoincludes cleanup from Jeff Garzik
Eric Andersen [Fri, 23 Mar 2001 17:02:05 +0000 (17:02 -0000)]
includes cleanup from Jeff Garzik

23 years agoSome minor wordsmithing, an extra item in the list of "things Busybox doesn't
Mark Whitley [Thu, 22 Mar 2001 22:59:33 +0000 (22:59 -0000)]
Some minor wordsmithing, an extra item in the list of "things Busybox doesn't
need", example of a testcase, more janitorial items, and a whole new section
with guidelines on committing changes to CVS.

23 years agoPatch from Dirk Behme <dirk.behme@de.bosch.com> to
Eric Andersen [Thu, 22 Mar 2001 19:01:16 +0000 (19:01 -0000)]
Patch from Dirk Behme <dirk.behme@de.bosch.com> to
add EM_MIPS_RS3_LE for mips
 -Erik

23 years agoClean up more local vars which shadow globals
Eric Andersen [Wed, 21 Mar 2001 21:52:25 +0000 (21:52 -0000)]
Clean up more local vars which shadow globals
 -Erik

23 years agoA nice patch from Larry Doolittle that adds -Wshadow and
Eric Andersen [Wed, 21 Mar 2001 07:34:27 +0000 (07:34 -0000)]
A nice patch from Larry Doolittle that adds -Wshadow and
cleans up most of the now-revealed problems.

23 years agoAdded a section on the available Busybox boot-floppy image. Also provided some
Mark Whitley [Tue, 20 Mar 2001 19:57:30 +0000 (19:57 -0000)]
Added a section on the available Busybox boot-floppy image. Also provided some
linkes to a Wired article on Midori Linux.

23 years agoAdded adjtimex applet from Larry Doolittle.
Mark Whitley [Tue, 20 Mar 2001 19:18:10 +0000 (19:18 -0000)]
Added adjtimex applet from Larry Doolittle.

23 years agoForce applet_name to be "sh" when command prefaced by "-"
Eric Andersen [Tue, 20 Mar 2001 17:39:53 +0000 (17:39 -0000)]
Force applet_name to be "sh" when command prefaced by "-"

23 years agoFix up command line munging in init. Postpone the askfirst thing till
Eric Andersen [Tue, 20 Mar 2001 17:39:08 +0000 (17:39 -0000)]
Fix up command line munging in init.  Postpone the askfirst thing till
a bit later in run().

23 years agochown was missing a ] in its usage msg
Eric Andersen [Tue, 20 Mar 2001 01:06:14 +0000 (01:06 -0000)]
chown was missing a ] in its usage msg

23 years agoAnother cleanup patch from Jeff Garzik <jgarzik@mandrakesoft.com>
Eric Andersen [Mon, 19 Mar 2001 23:49:41 +0000 (23:49 -0000)]
Another cleanup patch from Jeff Garzik <jgarzik@mandrakesoft.com>

23 years agoSize optimization for rdate from Vladimir
Eric Andersen [Mon, 19 Mar 2001 19:41:54 +0000 (19:41 -0000)]
Size optimization for rdate from Vladimir

23 years agoSimpify detection of no options.
Eric Andersen [Mon, 19 Mar 2001 19:40:43 +0000 (19:40 -0000)]
Simpify detection of no options.

23 years agoPatch from Vladimir to move struct applet from busybox.c to applets.c,
Eric Andersen [Mon, 19 Mar 2001 19:30:24 +0000 (19:30 -0000)]
Patch from Vladimir to move struct applet from busybox.c to applets.c,
which looks like the right place for such things to live.

23 years agoPer suggestion from Vladimir, no need to initialize these -- let the bss
Eric Andersen [Mon, 19 Mar 2001 19:28:24 +0000 (19:28 -0000)]
Per suggestion from Vladimir, no need to initialize these -- let the bss
do it.
 -Erik

23 years agolocale correction patch from Vladimir
Eric Andersen [Mon, 19 Mar 2001 19:25:49 +0000 (19:25 -0000)]
locale correction patch from Vladimir

23 years agoSplit error messages into separate files.
Eric Andersen [Mon, 19 Mar 2001 19:24:06 +0000 (19:24 -0000)]
Split error messages into separate files.

Update libbb.h, per suggestion from Vladimir, to include __attribute__((format
(printf ...))) stuff
 -Erik

23 years agoShould exclude "i" option when not enabled.
Eric Andersen [Mon, 19 Mar 2001 18:59:01 +0000 (18:59 -0000)]
Should exclude "i" option when not enabled.

23 years agoDoesn't need a "-" option -- getopt does that for us.
Eric Andersen [Mon, 19 Mar 2001 18:57:08 +0000 (18:57 -0000)]
Doesn't need a "-" option -- getopt does that for us.

23 years agoPatch from Vladimir to force interactiveFlag=FALSE when forceFlag=TRUE
Eric Andersen [Mon, 19 Mar 2001 18:54:38 +0000 (18:54 -0000)]
Patch from Vladimir to force interactiveFlag=FALSE when forceFlag=TRUE

23 years agogetopt-ify rm so that BB_FEATURE_RM_INTERACTIVE will work
Eric Andersen [Mon, 19 Mar 2001 18:52:37 +0000 (18:52 -0000)]
getopt-ify rm so that BB_FEATURE_RM_INTERACTIVE will work

23 years agoSplit libbb/pwd_grp_wrappers.c into 5 different libbb/my_* files.
Eric Andersen [Mon, 19 Mar 2001 18:37:42 +0000 (18:37 -0000)]
Split libbb/pwd_grp_wrappers.c into 5 different libbb/my_* files.
 -Erik

23 years agoFix to cmdedit.c from Vladimir
Eric Andersen [Mon, 19 Mar 2001 17:48:55 +0000 (17:48 -0000)]
Fix to cmdedit.c from Vladimir

23 years agoSome configuration adjustments from Vladimir
Eric Andersen [Mon, 19 Mar 2001 17:25:21 +0000 (17:25 -0000)]
Some configuration adjustments from Vladimir

23 years agoFix a bug pointed out by Rob Landley <rlandley@austin.rr.com>, where
Eric Andersen [Sat, 17 Mar 2001 05:43:39 +0000 (05:43 -0000)]
Fix a bug pointed out by Rob Landley <rlandley@austin.rr.com>, where
setup_sockaddr_in was zeroing the sizeof a pointer, not the sizeof the struct,
which was obviously what was intended.  Thanks Rob,
 -Erik

23 years agoPatch from Larry and Vladimir to clean up sh.c and fix
Eric Andersen [Sat, 17 Mar 2001 00:20:10 +0000 (00:20 -0000)]
Patch from Larry and Vladimir to clean up sh.c and fix
shell expansion to work in non POSIX locales.

23 years agoupdate .cvsignore files to note new location of loop.h
Eric Andersen [Sat, 17 Mar 2001 00:15:02 +0000 (00:15 -0000)]
update .cvsignore files to note new location of loop.h

23 years agoPatch from Pierre PEIFFER <pierre.peiffer@sxb.bsf.alcatel.fr>
Eric Andersen [Sat, 17 Mar 2001 00:05:42 +0000 (00:05 -0000)]
Patch from Pierre PEIFFER <pierre.peiffer@sxb.bsf.alcatel.fr>
that copes with the fact that processes may have been swapped
out.

23 years agoStupid thinko. egrep tried to call init. Sigh. Fix from Christophe Boyanique
Eric Andersen [Fri, 16 Mar 2001 23:49:20 +0000 (23:49 -0000)]
Stupid thinko.  egrep tried to call init. Sigh.  Fix from Christophe Boyanique

23 years agoConvert utility.c into libbb.a. It is now a whole pile of .c
Eric Andersen [Fri, 16 Mar 2001 22:47:14 +0000 (22:47 -0000)]
Convert utility.c into libbb.a.  It is now a whole pile of .c
files.  Clean up the resulting damage and fix up the makefile.
 -Erik

23 years agoA few minor touchups.
Eric Andersen [Fri, 16 Mar 2001 08:30:00 +0000 (08:30 -0000)]
A few minor touchups.

23 years agoThere was an unwanted extra newline, which prevented building 0_50
Eric Andersen [Fri, 16 Mar 2001 08:06:30 +0000 (08:06 -0000)]
There was an unwanted extra newline, which prevented building
uudecode.  How did this sneak through the testing until now?
 -Erik

23 years agoFix the make release target.
Eric Andersen [Fri, 16 Mar 2001 07:43:53 +0000 (07:43 -0000)]
Fix the make release target.

23 years agoUpdate webpage noting 0.50 release.
Eric Andersen [Fri, 16 Mar 2001 07:16:12 +0000 (07:16 -0000)]
Update webpage noting 0.50 release.

23 years agoA patch from Andreas Neuhaus to be especially careful to not dup
Eric Andersen [Fri, 16 Mar 2001 01:14:04 +0000 (01:14 -0000)]
A patch from Andreas Neuhaus to be especially careful to not dup
any env variables when spawning child processes.

23 years agoFix from Larry for glob problems.
Eric Andersen [Thu, 15 Mar 2001 23:01:19 +0000 (23:01 -0000)]
Fix from Larry for glob problems.
 -Erik

23 years agoRemove the "GPL2" bit, since it hung over the end of the line.
Eric Andersen [Thu, 15 Mar 2001 22:58:11 +0000 (22:58 -0000)]
Remove the "GPL2" bit, since it hung over the end of the line.

23 years agoApplied patch from Larry Doolittle to fix problem where multibuild.pl would
Mark Whitley [Thu, 15 Mar 2001 22:14:26 +0000 (22:14 -0000)]
Applied patch from Larry Doolittle to fix problem where multibuild.pl would
build the wrong files. Made the same changes to multifeat.pl.

23 years agoUpdate files and version number prepratory to cutting a release.
Eric Andersen [Thu, 15 Mar 2001 22:12:43 +0000 (22:12 -0000)]
Update files and version number prepratory to cutting a release.
 -Erik

23 years agoFix egrep
Eric Andersen [Thu, 15 Mar 2001 21:33:33 +0000 (21:33 -0000)]
Fix egrep

23 years agoOne tiny little missing newline that confused pod.
Mark Whitley [Thu, 15 Mar 2001 21:20:25 +0000 (21:20 -0000)]
One tiny little missing newline that confused pod.

23 years agoOne tinly, little, missing newline that confused Pod.
Mark Whitley [Thu, 15 Mar 2001 21:19:09 +0000 (21:19 -0000)]
One tinly, little, missing newline that confused Pod.

23 years ago- generated middle section of busybox.pod w/ autodocifier.pl
John Beppu [Thu, 15 Mar 2001 21:08:01 +0000 (21:08 -0000)]
- generated middle section of busybox.pod w/ autodocifier.pl
- updated autodocifier.pl to use tab to indent example section

23 years agoA better fix. Read nextPtr before mem gets freed.
Eric Andersen [Thu, 15 Mar 2001 21:04:18 +0000 (21:04 -0000)]
A better fix.  Read nextPtr before mem gets freed.
 -Erik