Changeset 5ba8e3b in freewrt

Timestamp:

Jun 29, 2007, 8:58:00 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

b4ac44c

Parents:

99b974e

Message:

• provide a list of changes (“fwcf status”)
• free(3) memory correctly

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

Location:

package/fwwif/extra

Files:

• commit.ecpp (modified) (1 diff)
• version.ecpp (modified) (1 diff)

package/fwwif/extra/commit.ecpp

@@ -63 +63 @@
 <p class="blkbeg">The “fwcf commit” utility returned the following output:</p>
 <pre class="blkmid">
-%               reply.sout() << text;
+%               reply.sout() << text ? text : "(null)";
 </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 {
+%               int i;
+%               char *changes;
+%
 %               do {
 %                       checkpoint = arc4random();      /* authorisation */
 %               } while (!checkpoint);
+%               changes = c_exec("/sbin/fwcf status", &i);
+%               if (changes) {
+<p class="blkbeg">The following files have been modified:</p>
+<pre class="blkmid"><$ changes $></pre>
+<p class="blkend">Do you really want to commit all these changes
+%                       free(changes);
+%               } else {
 <h1>Commit to flash</h1>
-<p>Do you really want to commit all changes to <tt>/etc</tt> into
- flash to retain them over system reboots?</p>
+<p>Do you really want to commit all changes to <tt>/etc</tt>
+%               }
+ into flash to retain them over system reboots?</p>
 <table width="100%">
  <tr>

package/fwwif/extra/version.ecpp

@@ -41 +41 @@
 </%cpp>
 <p class="blkbeg">The “fwwif version” utility returned the following output:</p>
-<pre class="blkmid"><$ text $></pre><p
+<pre class="blkmid"><$ text ? text : "(null)" $></pre><p
  class="blkend">The exit code was <$ i > 0 ? WEXITSTATUS(i) : i $>.</p>
 <p>Go <a href="javascript:back();">back</a> or to the <a href="/">index</a>.</p>
+%       if (text)
+%               free(text);
 <& footer>