kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add patch-gkrellkam.c to use fetch(1) instead of depending on wget

Browse source 
to download images.
This commit is contained in:
Patrick Li 2001-11-29 08:24:49 +00:00
parent 2ee6ef6a50
commit c2b6bd142d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=50720
1 changed files with 77 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
graphics/gkrellkam/files/patch-gkrellkam.c Normal file
View file

@ -0,0 +1,77 @@
--- gkrellkam.c.orig Thu Nov 29 02:04:48 2001
+++ gkrellkam.c Thu Nov 29 02:04:24 2001
@@ -131,8 +131,7 @@
"local picture file, list of files, or a script, enter the\n",
"_full_ filename in the \"Image Source\" box. To watch a webcam\n",
"or other online picture, just put its address (beginning with\n",
-"http:// or ftp://) in the \"Image Source\" box. You'll need\n",
-"GNU wget installed to be able to get pictures from the internet.\n",
+"http:// or ftp://) in the \"Image Source\" box.\n",
"Special case: when this field begins with \"-x\" followed by a\n",
"space and some more text, the remaining text is assumed to be a\n",
"script or other system commmand, and the whole path does not\n",
@@ -172,7 +171,6 @@
static const char *default_viewer = "eeyes";
-#define wget_opts "--proxy=off --cache=off"
#define BUFLEN 256
#define MIN_NUMPANELS 0
#define MAX_NUMPANELS 5
@@ -448,11 +446,11 @@
/*
start_img_dl ()
- Open a pipe and spawn wget.
+ Open a pipe and spawn fetch.
*/
static void start_img_dl (KKamPanel *p)
{
- gchar *wget_str;
+ gchar *fetch_str;
char tmpfile[] = TEMPTEMPLATE "XXXXXX";
int tmpfd;
@@ -473,20 +471,19 @@
p->delete_when_done = TRUE;
p->from_script = FALSE;
- wget_str = g_strdup_printf ("wget -q %s -O %s %s",
- wget_opts,
+ fetch_str = g_strdup_printf ("fetch -p -q -o %s %s",
p->tmpfile,
panel_cursource (p)->img_name);
- p->cmd_pipe = popen (wget_str, "r");
- g_free (wget_str);
+ p->cmd_pipe = popen (fetch_str, "r");
+ g_free (fetch_str);
if (p->cmd_pipe == NULL)
{
unlink (p->tmpfile);
g_free (p->tmpfile);
p->tmpfile = NULL;
p->delete_when_done = FALSE;
- report_error (_("Couldn't start wget: %s"), strerror (errno));
+ report_error (_("Couldn't start fetch: %s"), strerror (errno));
return;
}
fcntl (fileno (p->cmd_pipe), F_SETFL, O_NONBLOCK);
@@ -578,7 +575,7 @@
/* if we reach here the pipe is dead- the command has finished. */
code = pclose (p->cmd_pipe);
p->cmd_pipe = NULL;
- if (p->from_script == FALSE && code == 0) /* success for wget */
+ if (p->from_script == FALSE && code == 0) /* success for fetch */
{
load_image_file (p, p->tmpfile);
g_free (p->tmpfile);
@@ -598,7 +595,7 @@
load_image_file (p, buf);
}
- /* if we get here with wget, then wget said something. This is generally
+ /* if we get here with fetch, then fetch said something. This is generally
not good, since we passed -q. We'll have to wait for it to die */
pclose (p->cmd_pipe);