Remove win32 and cygwin support

3 files changed, 0 insertions, 63 deletions

diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index ccba1a8b4..dbcfd81c4 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -112,10 +112,6 @@ GNUNET_FS_file_information_create_from_file(
   const char *fn;
   const char *ss;
 
-#if WINDOWS
-  char fn_conv[MAX_PATH];
-#endif
-
   /* FIXME: should include_symbolic_links be GNUNET_NO or GNUNET_YES here? */
   if (GNUNET_OK !=
       GNUNET_DISK_file_size(filename, &fsize, GNUNET_NO, GNUNET_YES))
@@ -143,18 +139,12 @@ GNUNET_FS_file_information_create_from_file(
     return NULL;
   ret->h = h;
   ret->filename = GNUNET_strdup(filename);
-#if !WINDOWS
   fn = filename;
-#else
-  plibc_conv_to_win_path(filename, fn_conv);
-  fn = fn_conv;
-#endif
   while (NULL != (ss = strstr(fn, DIR_SEPARATOR_STR)))
     fn = ss + 1;
 /* FIXME: If we assume that on other platforms CRT is UTF-8-aware, then
  * this should be changed to EXTRACTOR_METAFORMAT_UTF8
  */
-#if !WINDOWS
   GNUNET_CONTAINER_meta_data_insert(ret->meta,
                                     "<gnunet>",
                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
@@ -162,15 +152,6 @@ GNUNET_FS_file_information_create_from_file(
                                     "text/plain",
                                     fn,
                                     strlen(fn) + 1);
-#else
-  GNUNET_CONTAINER_meta_data_insert(ret->meta,
-                                    "<gnunet>",
-                                    EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-                                    EXTRACTOR_METAFORMAT_UTF8,
-                                    "text/plain",
-                                    fn,
-                                    strlen(fn) + 1);
-#endif
   return ret;
 }
 
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index eda6765ab..14a43e6ec 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -87,13 +87,8 @@ display_bar(unsigned long long x, unsigned long long n, unsigned int w)
   unsigned int endeq;
   float ratio_complete;
 
-#if !WINDOWS
   if (0 == isatty(1))
     return;
-#else
-  if (FILE_TYPE_CHAR != GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)))
-    return;
-#endif
   ratio_complete = x / (float)n;
   endeq = ratio_complete * w;
   GNUNET_snprintf(buf, sizeof(buf), "%3d%% [", (int)(ratio_complete * 100));
@@ -175,13 +170,8 @@ progress_cb(void *cls, const struct GNUNET_FS_ProgressInfo *info)
       break;
 
     case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
-#if !WINDOWS
       if (0 != isatty(1))
         fprintf(stdout, "\n");
-#else
-      if (FILE_TYPE_CHAR == GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)))
-        fprintf(stdout, "\n");
-#endif
       fprintf(stderr,
               _("Error downloading: %s.\n"),
               info->value.download.specifics.error.message);
@@ -192,13 +182,8 @@ progress_cb(void *cls, const struct GNUNET_FS_ProgressInfo *info)
       s = GNUNET_STRINGS_byte_size_fancy(
         info->value.download.completed * 1000 /
         (info->value.download.duration.rel_value_us + 1));
-#if !WINDOWS
       if (0 != isatty(1))
         fprintf(stdout, "\n");
-#else
-      if (FILE_TYPE_CHAR == GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)))
-        fprintf(stdout, "\n");
-#endif
       fprintf(stdout,
               _("Downloading `%s' done (%s/s).\n"),
               info->value.download.filename,
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c
index db74e65aa..a6776d84f 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -434,7 +434,6 @@ extract_files(struct ScanTreeNode *item)
 }
 
 
-#ifndef WINDOWS
 /**
  * Install a signal handler to ignore SIGPIPE.
  */
@@ -479,8 +478,6 @@ make_dev_zero(int fd, int flags)
   GNUNET_assert(0 == close(z));
 }
 
-#endif
-
 
 /**
  * Main function of the helper process to extract meta data.
@@ -499,23 +496,12 @@ main(int argc, char *const *argv)
   const char *ex;
   struct ScanTreeNode *root;
 
-#if WINDOWS
-  /* We're using stdout to communicate binary data back to the parent; use
-   * binary mode.
-   */
-  _setmode(1, _O_BINARY);
-  /* Get utf-8-encoded arguments */
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
-    return 5;
-  output_stream = 1; /* stdout */
-#else
   ignore_sigpipe();
   /* move stdout to some other FD for IPC, bind
      stdout/stderr to /dev/null */
   output_stream = dup(1);
   make_dev_zero(1, O_WRONLY);
   make_dev_zero(2, O_WRONLY);
-#endif
 
   /* parse command line */
   if ((3 != argc) && (2 != argc))
@@ -523,9 +509,6 @@ main(int argc, char *const *argv)
       fprintf(stderr,
               "%s",
               "gnunet-helper-fs-publish needs exactly one or two arguments\n");
-#if WINDOWS
-      GNUNET_free((void *)argv);
-#endif
       return 1;
     }
   filename_expanded = argv[1];
@@ -548,9 +531,6 @@ main(int argc, char *const *argv)
 #if HAVE_LIBEXTRACTOR
       EXTRACTOR_plugin_remove_all(plugins);
 #endif
-#if WINDOWS
-      GNUNET_free((void *)argv);
-#endif
       return 2;
     }
   /* signal that we're done counting files, so that a percentage of
@@ -563,9 +543,6 @@ main(int argc, char *const *argv)
 #if HAVE_LIBEXTRACTOR
       EXTRACTOR_plugin_remove_all(plugins);
 #endif
-#if WINDOWS
-      GNUNET_free((void *)argv);
-#endif
       return 3;
     }
   if (NULL != root)
@@ -579,9 +556,6 @@ main(int argc, char *const *argv)
 #if HAVE_LIBEXTRACTOR
           EXTRACTOR_plugin_remove_all(plugins);
 #endif
-#if WINDOWS
-          GNUNET_free((void *)argv);
-#endif
           return 4;
         }
       free_tree(root);
@@ -593,9 +567,6 @@ main(int argc, char *const *argv)
 #if HAVE_LIBEXTRACTOR
   EXTRACTOR_plugin_remove_all(plugins);
 #endif
-#if WINDOWS
-  GNUNET_free((void *)argv);
-#endif
   return 0;
 }