[GNUnet-SVN] r5037 - in GNUnet: contrib/win src/transports src/util/error src/util/loggers

[gnunet]

Author: durner
Date: 2007-06-13 11:57:08 -0600 (Wed, 13 Jun 2007)
New Revision: 5037

Modified:
   GNUnet/contrib/win/Installer.nsi
   GNUnet/src/transports/Makefile.am
   GNUnet/src/util/error/error.c
   GNUnet/src/util/loggers/file.c
Log:
add libgnunetip

Modified: GNUnet/contrib/win/Installer.nsi
===================================================================
--- GNUnet/contrib/win/Installer.nsi    2007-06-13 07:39:39 UTC (rev 5036)
+++ GNUnet/contrib/win/Installer.nsi    2007-06-13 17:57:08 UTC (rev 5037)
@@ -104,6 +104,7 @@
          SetOutPath "$INSTDIR\bin"
          File "gnu.ico"        
          File "config.ico"     
+    File "C:\GNUnet\bin\libgnunetip-0.dll" 
                File "C:\GNUnet\bin\libgnunetmodule_state.dll" 
                File "C:\GNUnet\bin\libgnunetutil-1.dll" 
                File "C:\GNUnet\bin\libgnunetutil_boot-0.dll" 
@@ -907,6 +908,7 @@
   Delete "$INSTDIR\bin\libgnunetmodule_upnp.dll"
        Delete "$INSTDIR\bin\libgnunetutil-1.dll"
        Delete "$INSTDIR\bin\libgnunetmodule_state.dll"
+  Delete "$INSTDIR\bin\libgnunetip-0.dll"
        Delete "$INSTDIR\bin\libgnunetutil_config-0.dll"
        Delete "$INSTDIR\bin\libgnunetutil_cron-0.dll"
        Delete "$INSTDIR\bin\libgnunetutil_crypto-0.dll"

Modified: GNUnet/src/transports/Makefile.am
===================================================================
--- GNUnet/src/transports/Makefile.am   2007-06-13 07:39:39 UTC (rev 5036)
+++ GNUnet/src/transports/Makefile.am   2007-06-13 17:57:08 UTC (rev 5037)
@@ -34,7 +34,9 @@
 
 libgnunetip_la_SOURCES = \
   ip.c ip.h
-
+libgnunetip_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+ 
 libgnunetip6_la_SOURCES = \
   ip6.c ip6.h
 

Modified: GNUnet/src/util/error/error.c
===================================================================
--- GNUnet/src/util/error/error.c       2007-06-13 07:39:39 UTC (rev 5036)
+++ GNUnet/src/util/error/error.c       2007-06-13 17:57:08 UTC (rev 5037)
@@ -66,16 +66,10 @@
   struct tm * tmptr;
   size_t size;
   char * buf;
-#ifdef WINDOWS
-  int alloc_console = NO;
-#endif
 
-  if (ctx == NULL) {
+  if (ctx == NULL)
     ctx = defaultContext;
-#ifdef WINDOWS
-    alloc_console = YES;
-#endif
-  }
+
   if ( (ctx != NULL)  &&
        (! GE_applies(kind, ctx->mask)) )
     return;
@@ -84,18 +78,6 @@
         ((kind & (GE_FATAL | GE_ERROR | GE_WARNING)) == 0) ) )
     return;
 
-#ifdef WINDOWS
-    /* Most tools disband the console window early in the initialization
-       process, so we have to create a new one if we're logging to the
-       default context. */
-    if (alloc_console && AllocConsole()) {
-      if (ctx)
-        ctx->handler(ctx->cls, kind, date, _("Error log:\n"));
-      else
-        fprintf(stderr, "%s", _("Error log:\n"));
-    }
-#endif
-
   va_start(va, message);
   size = VSNPRINTF(NULL, 0, message, va) + 1;
   va_end(va);

Modified: GNUnet/src/util/loggers/file.c
===================================================================
--- GNUnet/src/util/loggers/file.c      2007-06-13 07:39:39 UTC (rev 5036)
+++ GNUnet/src/util/loggers/file.c      2007-06-13 17:57:08 UTC (rev 5037)
@@ -236,6 +236,16 @@
       FREE(name);
     }
   }
+
+#ifdef WINDOWS
+    /* Most tools disband the console window early in the initialization
+       process, so we have to create a new one if we're logging to the 
console. */
+    if ((fctx->handle == stderr || fctx->handle == stdout)) {
+      AllocConsole();
+      SetConsoleTitle(_("GNUnet error log"));
+    }
+#endif  
+  
   if (fctx->logdate) {
     ret = fprintf(fctx->handle,
                  "%s %s: %s",