Changeset fd3230b in freewrt for package

Timestamp:

Jun 29, 2007, 6:40:44 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

ba3e3d1

Parents:

75d3d3c

Message:

integrate

• a helper to catch the stdout and stderr of subprocesses
• more of the MirBSD website's style sheet
• version information

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3032 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwwif/extra

Files:

• Makefile (modified) (1 diff)
• c_exec.c (added)
• c_exec.h (added)
• commit.ecpp (modified) (3 diffs)
• fwwif.ecpp (modified) (1 diff)
• fwws.css (modified) (2 diffs)
• version.ecpp (added)

package/fwwif/extra/Makefile

@@ -30 +30 @@
 OBJS+=          chpw.o c_chpw.o
 OBJS+=          md5.o md5hl.o md5crypt.o pwd_gensalt.o
-OBJS+=          commit.o
+OBJS+=          commit.o c_exec.o version.o
 CLEANFILES=     ${OBJS} ${OBJS:.o=.cpp} fwwif.so
 IMAGES=         logo.svg favicon.ico
 
-fwwif.o header.o footer.o commit.o: common.h
+fwwif.o header.o footer.o: common.h
 chpw.o c_chpw.o: c_chpw.h common.h
 md5.o md5hl.o md5crypt.o: md5.h common.h
 md5crypt.o pwd_gensalt.o c_chpw.o: md5crypt.h common.h
+c_exec.o commit.o version.o: c_exec.h common.h
 
 CLEANFILES+=    md5hl.c

package/fwwif/extra/commit.ecpp

@@ -27 +27 @@
 #include "common.h"
 #include <stdlib.h>
+#include "c_exec.h"
 __RCSID("$Id$");
 </%pre>
@@ -45 +46 @@
                 int i = 0;
                 const char *s = "fwcf commit";
+                char *text;
 
                 // XXX flush output here
 
                 checkpoint = arc4random();      /* prevent re-use */
-                i = system(s);
+                text = c_exec(s, &i);
                 if (i) {
 </%cpp>
@@ -59 +61 @@
  to flash using the FreeWRT Configuration Filesystem.</p>
 %               }
+<p class="blkbeg">The “fwcf commit” utility returned the following output:</p>
+<pre class="blkmid">
+%               reply.sout() << text;
+</pre><p class="blkend">The exit code was <$ WEXITSTATUS(i) $>.</p>
 <p>Go <a href="javascript:back();">back</a> or to the <a href="/">index</a>.</p>
 %       } else {

package/fwwif/extra/fwwif.ecpp

@@ -35 +35 @@
 <ul>
  <li><a href="chpw">change password</a></li>
- <li>&nbsp;</li>
+ <li style="list-style:none;">&nbsp;</li>
  <li><a href="commit">commit changes to flash</a> (FWCF)</li>
+ <li><a href="version">version information</a> (FWWIF)</li>
 </ul>
 <& footer>

package/fwwif/extra/fwws.css

@@ -6 +6 @@
  *      Thorsten Glaser <tg@mirbsd.de>
  * Parts of the style sheet are Copyright © 2004
+ *      Benny Siegert <bsiegert@mirbsd.org>
  *      Josef Söntgen <cnuke@mirbsd.de>
  *
@@ -66 +67 @@
         border-top:inset;
 }
+
+.blkbeg {
+        margin-bottom:0px;
+}
+
+.blkmid {
+        border:4px ridge blue;
+        margin:0px 24px 0px 24px;
+        padding:12px;
+}
+
+.blkend {
+        margin-top:0px;
+}