static int local_only;
+
static void
cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_FS_DownloadContext *d;
-
- if (dc != NULL)
+ if (NULL != dc)
{
- d = dc;
+ GNUNET_FS_download_stop (dc, delete_incomplete);
dc = NULL;
- GNUNET_FS_download_stop (d, delete_incomplete);
}
}
unsigned int endeq;
float ratio_complete;
-#ifndef MINGW
+#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;
for (p=endeq; p<w; p++)
strcat (buf, " ");
strcat (buf, "]\r");
- printf (buf);
+ printf ("%s", buf);
fflush(stdout);
}
}
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);
GNUNET_SCHEDULER_shutdown ();
s = GNUNET_STRINGS_byte_size_fancy (info->value.download.completed * 1000 /
(info->value.download.
duration.rel_value + 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, s);
GNUNET_free (s);