Add framework for listen() and connect() -- still missing logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@353 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 18 insertions, 11 deletions

diff --git a/nuttx/netutils/uiplib/makestrings.c b/nuttx/netutils/uiplib/makestrings.c
index ff7df83db..feebeb120 100755
--- a/nuttx/netutils/uiplib/makestrings.c
+++ b/nuttx/netutils/uiplib/makestrings.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
+#include <libgen.h>
 #include <errno.h>
 
 /****************************************************************************
@@ -203,16 +204,18 @@ FILE *open_outfile(const char *filename)
 }
 
 /****************************************************************************
- * Function: generate_sourcefile_list
+ * Function: generate_mkdefs
  ****************************************************************************/
  
-int generate_sourcefile_list(void)
+int generate_mkdefs(void)
 {
   int ret = 1;
   FILE *stream;
   
   if (( stream = open_stringfile()))
     {
+	  printf("STRNG_ASRCS =\n");
+	  printf("STRNG_CSRCS = ");
       ret = 0;
       while (fgets(g_line, 1024, stream) && !ret)
         {
@@ -239,14 +242,16 @@ int generate_sourcefiles(void)
   FILE *cstream;
   const char *pname;
   const char *pvalue;
+  char *filename;
   char buffer[512];
   int len;
   int ndx;
   int ret = 1;
-  
+
+  filename = strdup(g_stringfile);
   if (( instream = open_stringfile()))
     {
-      snprintf(buffer, 512, "%s.h", g_stringfile);
+      snprintf(buffer, 512, "%s.h", basename(filename));
       hstream = open_outfile(buffer);
       if (hstream)
         {
@@ -258,11 +263,12 @@ int generate_sourcefiles(void)
               ret = parse_stringfile_line(&pname, &pvalue);
               if (!ret)
                 {
+                  len = strlen(pvalue);
+
                   snprintf(buffer, 512, "%s.c", pname);
                   cstream = open_outfile(buffer);
                   if (cstream)
                     {
-                      len = strlen(pvalue);
                       fprintf(cstream, "const char %s[%d] = {", pname, len);
                       for (ndx = 0; ndx < len; ndx++)
                         {
@@ -272,7 +278,7 @@ int generate_sourcefiles(void)
                             }
                           fprintf(cstream, "0x%02x", pvalue[ndx]);
                         }
-                      fprintf(cstream, "}\n");
+                      fprintf(cstream, "};\n");
                       fclose(cstream);
                     }
                   fprintf(hstream, "extern const char %s[%d];\n", pname, len);
@@ -283,6 +289,7 @@ int generate_sourcefiles(void)
         }
       fclose(instream);
     }
+  free(filename);
   return ret;
 }
 
@@ -364,7 +371,7 @@ int main(int argc, char **argv, char **envp)
           ret = generate_sourcefiles();
           break;
         case SRCLIST:
-          ret = generate_sourcefile_list();
+          ret = generate_mkdefs();
           break;
     }
   return ret;
diff --git a/nuttx/netutils/webclient/Make.defs b/nuttx/netutils/webclient/Make.defs
index a5bffd45a..7f6c98ced 100644
--- a/nuttx/netutils/webclient/Make.defs
+++ b/nuttx/netutils/webclient/Make.defs
@@ -34,4 +34,4 @@
 ############################################################################
 
 WEBCLIENT_ASRCS =
-WEBCLIENT_CSRCS = webclient-strings.c webclient.c
+WEBCLIENT_CSRCS = webclient.c
diff --git a/nuttx/netutils/webclient/webclient.h b/nuttx/netutils/webclient/webclient.h
index a293b61fc..8f7a8644f 100644
--- a/nuttx/netutils/webclient/webclient.h
+++ b/nuttx/netutils/webclient/webclient.h
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include <net/uip/uipopt.h>
 
-#include "webclient-strings.h"
+#include "netutil-strings.h"
 
 #define WEBCLIENT_CONF_MAX_URLLEN 100
 
diff --git a/nuttx/netutils/webserver/Make.defs b/nuttx/netutils/webserver/Make.defs
index 94469f526..ca3567861 100644
--- a/nuttx/netutils/webserver/Make.defs
+++ b/nuttx/netutils/webserver/Make.defs
@@ -34,4 +34,4 @@
 ############################################################################
 
 WEBSERVER_ASRCS =
-WEBSERVER_CSRCS = httpd.c http-strings.c httpd-fs.c httpd-cgi.c
+WEBSERVER_CSRCS = httpd.c httpd-fs.c httpd-cgi.c
diff --git a/nuttx/netutils/webserver/httpd.c b/nuttx/netutils/webserver/httpd.c
index 4f18a72df..dfccdef6c 100644
--- a/nuttx/netutils/webserver/httpd.c
+++ b/nuttx/netutils/webserver/httpd.c
@@ -42,7 +42,7 @@
 
 #include "httpd.h"
 #include "httpd-cgi.h"
-#include "http-strings.h"
+#include "netutil-strings.h"
 
 #include <string.h>