strftime fixes

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

3 files changed, 22 insertions, 11 deletions

diff --git a/nuttx/lib/lib_strftime.c b/nuttx/lib/lib_strftime.c
index 02cce388b..008586973 100644
--- a/nuttx/lib/lib_strftime.c
+++ b/nuttx/lib/lib_strftime.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * lib/lib_strftime.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,13 +70,13 @@
  * Private Data
  ****************************************************************************/
 
-static const char *g_abbrevmonthname[12] =
+static const char * const g_abbrevmonthname[12] =
 {
   "Jan", "Feb", "Mar", "Apr", "May", "Jun",
   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 
-static const char *g_monthname[12] =
+static const char * const g_monthname[12] =
 {
   "January", "February", "March",     "April",   "May",      "June",
   "July",    "August",   "September", "October", "November", "December"
@@ -163,12 +163,21 @@ size_t strftime(char *s, size_t max, const char *format, const struct tm *tm)
 
       /* Handle the format character */
 
+       format++;
        len   = 0;
-       value = 0;
-       str   = "??";
 
-       switch (*++format)
+       switch (*format++)
          {
+           /* %a: A three-letter abbreviation for the day of the week. */
+           /* %A: The full name for the day of the week. */
+
+           case 'a':
+           case 'A':
+             {
+               len = snprintf(dest, chleft, "Day"); /* Not supported */
+             }
+             break;
+           
            /* %h: Equivalent to %b */
 
            case 'h':
diff --git a/nuttx/netutils/thttpd/fdwatch.c b/nuttx/netutils/thttpd/fdwatch.c
index 45673e3f4..a402b8f71 100644
--- a/nuttx/netutils/thttpd/fdwatch.c
+++ b/nuttx/netutils/thttpd/fdwatch.c
@@ -177,7 +177,7 @@ void fdwatch_uninitialize(struct fdwatch_s *fw)
 
 void fdwatch_add_fd(struct fdwatch_s *fw, int fd, void *client_data, int rw)
 {
-  nvdbg("fd: %d\n", fd);
+  nvdbg("fd: %d client_data: %p\n", fd, client_data);
 
 #ifdef CONFIG_DEBUG
   if (fd < CONFIG_NFILE_DESCRIPTORS ||
@@ -347,11 +347,13 @@ int fdwatch_check_fd(struct fdwatch_s *fw, int fd)
 
 void *fdwatch_get_next_client_data(struct fdwatch_s *fw)
 {
-  if (fw->next >= fw->nfds)
+  if (fw->next >= fw->nwatched)
     {
-      ndbg("All client data returned: %d\n", fw->next);
-      return NULL;
+      nvdbg("All client data returned: %d\n", fw->next);
+      return (void*)-1;
     }
+
+  nvdbg("client_data[%d]: %p\n", fw->next, fw->client[fw->next].data);
   return fw->client[fw->next++].data;
 }
 
diff --git a/nuttx/netutils/thttpd/libhttpd.c b/nuttx/netutils/thttpd/libhttpd.c
index 68e1e5c48..1fe609dff 100644
--- a/nuttx/netutils/thttpd/libhttpd.c
+++ b/nuttx/netutils/thttpd/libhttpd.c
@@ -372,10 +372,10 @@ static void add_response(httpd_conn *hc, char *str)
 
   len = strlen(str);
   resplen = hc->buflen + len;
-  DEBUGASSERT(resplen < CONFIG_THTTPD_IOBUFFERSIZE);
 
   if (resplen > CONFIG_THTTPD_IOBUFFERSIZE)
     {
+      ndbg("resplen(%d) > buffer size(%d)\n", resplen, CONFIG_THTTPD_IOBUFFERSIZE);
       resplen = CONFIG_THTTPD_IOBUFFERSIZE;
       len     = resplen - hc->buflen;
     }