merge

diff --git a/ccan/build_assert/_info.30342 b/ccan/build_assert/_info.30342
new file mode 100755 (executable)
index 0000000..d1a638f
Binary files /dev/null and b/ccan/build_assert/_info.30342 differ

diff --git a/ccan/build_assert/_info.30850 b/ccan/build_assert/_info.30850
new file mode 100755 (executable)
index 0000000..d1a638f
Binary files /dev/null and b/ccan/build_assert/_info.30850 differ

diff --git a/ccan/string/test/run-grab.c b/ccan/string/test/run-grab.c
index cfd8b9b43abf63b90436676ad67a11b86cfe765b..96b9dac852b428224171563e608c6126ec1e1f0f 100644 (file)
--- a/ccan/string/test/run-grab.c
+++ b/ccan/string/test/run-grab.c
@@ -1,6 +1,5 @@
-/* This is test for grab_file() function */
-
-/*
+/* This is test for grab_file() function
+ *
  * Example:
  * 
  * void *grab_file(const void *ctx, const char *filename)
@@ -22,4 +21,34 @@
  *     }
  */
 
+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <err.h>
+#include       <sys/stat.h>
+#include       "string/string.h"
+#include       "string/string.c"
+#include       "tap/tap.h"
+
+int 
+main(int argc, char *argv[])
+{
+       unsigned int    i;
+       char            **split, *str;
+       int             length;
+       struct          stat st;
+
+       str = grab_file(NULL, "ccan/string/test/run-grab.c");
+       split = strsplit(NULL, str, "\n", NULL);
+       length = strlen(split[0]);
+       ok1(streq(split[0], "/* This is test for grab_file() function"));
+       for (i = 1; split[i]; i++)      
+               length += strlen(split[i]);
+       ok1(streq(split[i-1], "/* End of grab_file() test */"));
+       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
+               err(1, "Could not stat self");
+       ok1(st.st_size == length + i);
+       
+       return 0;
+}
+
 /* End of grab_file() test */

diff --git a/ccan/string/test/run.c b/ccan/string/test/run.c
index f68e7ec56c5c886293be9b5f8e4c086e6076ebfb..c50854ab61c5d996e5365af50bbbce9158c1ad93 100644 (file)
--- a/ccan/string/test/run.c
+++ b/ccan/string/test/run.c
@@ -27,9 +27,7 @@ int main(int argc, char *argv[])
        char **split, *str;
        void *ctx;
        char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];
-       int length;
-       struct stat st;
-
+       
        n = 0;
        for (i = 0; i < NUM_SUBSTRINGS; i++) {
                for (j = 0; j < NUM_SUBSTRINGS; j++) {
@@ -117,16 +115,5 @@ int main(int argc, char *argv[])
        ok1(talloc_parent(str) == ctx);
        talloc_free(ctx);
 
-       str = grab_file(NULL, "ccan/string/test/run-grab.c");
-       split = strsplit(NULL, str, "\n", NULL);
-       length = strlen(split[0]);
-       ok1(streq(split[0], "/* This is test for grab_file() function */"));
-       for(i = 1; split[i]; i++)       
-               length += strlen(split[i]);
-       ok1(streq(split[i-1], "/* End of grab_file() test */"));
-       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
-               err(1, "Could not stat self");
-       ok1(st.st_size == length);
-               
        return exit_status();
 }                              

diff --git a/tools/create_dep_tar b/tools/create_dep_tar
index 7920b0b094cb1221023859ec5438b01ecb7473d7..715fb6ba856c2d501e41284ea4852fe9ba7100db 100755 (executable)
Binary files a/tools/create_dep_tar and b/tools/create_dep_tar differ

diff --git a/tools/create_dep_tar.c b/tools/create_dep_tar.c
index 74fdb5692461a3976b799ab1797b67d9ccd6dfe4..3a84f8d9d4ef6933579ea1dfababd3ee358d1126 100644 (file)
--- a/tools/create_dep_tar.c
+++ b/tools/create_dep_tar.c
@@ -53,7 +53,7 @@ create_tar(char **deps, const char *dir, const char *targetdir)
        
        if (deps != NULL) {
                cmd_args = strjoin(NULL, deps, " ");    
-               cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s_dependencies.tar %s %s", targetdir, module, cmd_args, dir);
+               cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s_with_deps.tar %s %s", targetdir, module, cmd_args, dir);
        } else 
                cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s.tar %s", targetdir, module, dir);
                        

diff --git a/web/configuration b/web/configuration
index d29bed87e294e6df753f5a98e8cf65eeb657f4ad..fcb383589d76a88b97b6072c6624e35415732b0c 100644 (file)
--- a/web/configuration
+++ b/web/configuration
@@ -29,9 +29,6 @@ $temprepo = "temprepo/";
 //email from 
 $frommail = "ccan@ozlabs.org";
 
-//email for admins
-$ccan_admin = "g.dinesh.cse@gmail.com";
-
 //ccan home 
 $ccan_home_dir = "ccan/";
 
@@ -43,4 +40,4 @@ $bzr_push = 'bzr push /home/dinesh/testwebsite/ ';
 
 //tar home dir
 $tar_dir = 'tarball/';
-?>
\ No newline at end of file
+?>

diff --git a/web/db/ccan.db b/web/db/ccan.db
index 77ba6a0124043f33651ca520d14f848fa4d6fc46..503c7fcc4c2309b8b2b419128731fa0a28e13841 100755 (executable)
Binary files a/web/db/ccan.db and b/web/db/ccan.db differ

diff --git a/web/dispmoduleinfo.php b/web/dispmoduleinfo.php
index b0aba20e0097b4694b92f3992b122ec5523abee6..9c26f9ea72a9881578fd38d66287ed259f60023c 100644 (file)
--- a/web/dispmoduleinfo.php
+++ b/web/dispmoduleinfo.php
@@ -19,7 +19,7 @@ $row = sqlite3_fetch_array($result);
 <td>
        <?php 
                if(file_exists($tar_dir . $_GET['module']."_dependencies.tar"))
-                       echo '<a href='. $tar_dir . $_GET['module'] . '_dependencies.tar>Download Dependencies</a>';
+                       echo '<a href='. $tar_dir . $_GET['module'] . '_with_deps.tar>Download Dependencies</a>';
        ?>
 </td>
 </tr>
@@ -54,4 +54,4 @@ function checkerror($status, $msg)
                    exit();
        }
 } 
-?>
\ No newline at end of file
+?>

diff --git a/web/functions.php b/web/functions.php
index 4228c3ae430242b798dd4695fad5cd4ddcd7deea..4b89fa5a38bd3748edb602efac515e681c616595 100644 (file)
--- a/web/functions.php
+++ b/web/functions.php
@@ -36,7 +36,7 @@ function getccanadmin($db)
        $result = sqlite3_query($handle, $query) or die("Error in query: ".sqlite3_error($handle));
 
        while ($row = sqlite3_fetch_array($result))
-        $admin = $admin.$row[0].",";
+        $admin = $admin.$row['email'].",";
    return $admin; 
 }
-?>
\ No newline at end of file
+?>

diff --git a/web/requestid.php b/web/requestid.php
index eedada5323a8cce107171a8630588fd7d459cbe3..3d293ddd074fb99d391b15762068709969cfe2e4 100644 (file)
--- a/web/requestid.php
+++ b/web/requestid.php
@@ -3,6 +3,7 @@ session_start();
 include('logo.html');
 include('menulist.html');
 include('configuration');
+include('functions.php');
 
 if(isset($_POST['submit'])) {
        $name = $_REQUEST['name'];
@@ -80,7 +81,7 @@ $result = sqlite3_exec($handle, $query) or die("Error in query: ".sqlite3_error(
 
 $subject = "Approval of ccan account";
 $message = "There is new request for ccan account id.\n\n Please use the following link to approve http://ccan.ozlabs.org/dinesh/approval.php?accountid=".$accountid;
-mail($ccan_admin, $subject, $message, "From: $email");
+mail(getccanadmin($db), $subject, $message, "From: $email");
 ?>
        </br><div>Thank you for registering with CCAN. You will get the password to your mail after approval.</div>
 <?php

diff --git a/web/tarball/alignof.tar b/web/tarball/alignof.tar
new file mode 100644 (file)
index 0000000..bbb8630
Binary files /dev/null and b/web/tarball/alignof.tar differ

diff --git a/web/tarball/alignof_with_deps.tar b/web/tarball/alignof_with_deps.tar
new file mode 100644 (file)
index 0000000..22f8a71
Binary files /dev/null and b/web/tarball/alignof_with_deps.tar differ

diff --git a/web/tarball/alloc.tar b/web/tarball/alloc.tar
new file mode 100644 (file)
index 0000000..f6accbd
Binary files /dev/null and b/web/tarball/alloc.tar differ

diff --git a/web/tarball/alloc_with_deps.tar b/web/tarball/alloc_with_deps.tar
new file mode 100644 (file)
index 0000000..e302074
Binary files /dev/null and b/web/tarball/alloc_with_deps.tar differ

diff --git a/web/tarball/build_assert.tar b/web/tarball/build_assert.tar
new file mode 100644 (file)
index 0000000..a7fe39a
Binary files /dev/null and b/web/tarball/build_assert.tar differ

diff --git a/web/tarball/build_assert_with_deps.tar b/web/tarball/build_assert_with_deps.tar
new file mode 100644 (file)
index 0000000..0e08d8a
Binary files /dev/null and b/web/tarball/build_assert_with_deps.tar differ

diff --git a/web/tarball/check_type.tar b/web/tarball/check_type.tar
new file mode 100644 (file)
index 0000000..c5ae04c
Binary files /dev/null and b/web/tarball/check_type.tar differ

diff --git a/web/tarball/check_type_with_deps.tar b/web/tarball/check_type_with_deps.tar
new file mode 100644 (file)
index 0000000..c0919cd
Binary files /dev/null and b/web/tarball/check_type_with_deps.tar differ

diff --git a/web/tarball/container_of.tar b/web/tarball/container_of.tar
new file mode 100644 (file)
index 0000000..a0dae39
Binary files /dev/null and b/web/tarball/container_of.tar differ

diff --git a/web/tarball/container_of_with_deps.tar b/web/tarball/container_of_with_deps.tar
new file mode 100644 (file)
index 0000000..15c8fdb
Binary files /dev/null and b/web/tarball/container_of_with_deps.tar differ

diff --git a/web/tarball/hash.tar b/web/tarball/hash.tar
new file mode 100644 (file)
index 0000000..a51e899
Binary files /dev/null and b/web/tarball/hash.tar differ

diff --git a/web/tarball/hash_with_deps.tar b/web/tarball/hash_with_deps.tar
new file mode 100644 (file)
index 0000000..e6c2f26
Binary files /dev/null and b/web/tarball/hash_with_deps.tar differ

diff --git a/web/tarball/list.tar b/web/tarball/list.tar
new file mode 100644 (file)
index 0000000..d58be44
Binary files /dev/null and b/web/tarball/list.tar differ

diff --git a/web/tarball/list_with_deps.tar b/web/tarball/list_with_deps.tar
new file mode 100644 (file)
index 0000000..3e371ea
Binary files /dev/null and b/web/tarball/list_with_deps.tar differ

diff --git a/web/tarball/noerr.tar b/web/tarball/noerr.tar
new file mode 100644 (file)
index 0000000..3eafdcf
Binary files /dev/null and b/web/tarball/noerr.tar differ

diff --git a/web/tarball/noerr_with_deps.tar b/web/tarball/noerr_with_deps.tar
new file mode 100644 (file)
index 0000000..fb39eb6
Binary files /dev/null and b/web/tarball/noerr_with_deps.tar differ

diff --git a/web/tarball/string.tar b/web/tarball/string.tar
new file mode 100644 (file)
index 0000000..deedf97
Binary files /dev/null and b/web/tarball/string.tar differ

diff --git a/web/tarball/string_with_deps.tar b/web/tarball/string_with_deps.tar
new file mode 100644 (file)
index 0000000..f7cde07
Binary files /dev/null and b/web/tarball/string_with_deps.tar differ

diff --git a/web/tarball/talloc.tar b/web/tarball/talloc.tar
new file mode 100644 (file)
index 0000000..40bae0d
Binary files /dev/null and b/web/tarball/talloc.tar differ

diff --git a/web/tarball/talloc_with_deps.tar b/web/tarball/talloc_with_deps.tar
new file mode 100644 (file)
index 0000000..38c87d3
Binary files /dev/null and b/web/tarball/talloc_with_deps.tar differ

diff --git a/web/tarball/tap.tar b/web/tarball/tap.tar
new file mode 100644 (file)
index 0000000..5e37ad6
Binary files /dev/null and b/web/tarball/tap.tar differ

diff --git a/web/tarball/tap_with_deps.tar b/web/tarball/tap_with_deps.tar
new file mode 100644 (file)
index 0000000..42e7c78
Binary files /dev/null and b/web/tarball/tap_with_deps.tar differ

diff --git a/web/tarball/typesafe_cb.tar b/web/tarball/typesafe_cb.tar
new file mode 100644 (file)
index 0000000..937e709
Binary files /dev/null and b/web/tarball/typesafe_cb.tar differ

diff --git a/web/tarball/typesafe_cb_with_deps.tar b/web/tarball/typesafe_cb_with_deps.tar
new file mode 100644 (file)
index 0000000..79b8e58
Binary files /dev/null and b/web/tarball/typesafe_cb_with_deps.tar differ