fixing non-working sites

Makefile

@@ -6,11 +6,11 @@ prefix=/usr/local
 bindir=$(prefix)${exec_prefix}/bin
 DESTDIR=
 FLAGS=$(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBSSL=1 -DHAVE_LIBCRYPTO=1 
-OBJ=common.o settings.o containerfiles.o outputfiles.o servicetypes.o extract_text.o download.o display.o players.o selectformat.o ehow.o ign.o youtube.o 
+OBJ=common.o settings.o containerfiles.o outputfiles.o servicetypes.o extract_text.o download.o display.o players.o selectformat.o ehow.o youtube.o 
 
 all: $(OBJ)
 	@cd libUseful; $(MAKE)
-	$(CC) $(FLAGS) -o movgrab main.c $(LIBS) $(OBJ) libUseful/libUseful.a
+	$(CC) $(FLAGS) -o movgrab main.c $(OBJ) libUseful/libUseful.a $(LIBS) 
 
 clean:
 	@rm -f movgrab *.o libUseful/*.o libUseful/*.a libUseful/*.so config.log config.status
@@ -30,9 +30,6 @@ outputfiles.o: outputfiles.c outputfiles.h
 ehow.o: ehow.c ehow.h
 	$(CC) $(FLAGS) -c ehow.c
 
-ign.o: ign.c ign.h
-	$(CC) $(FLAGS) -c ign.c
-
 youtube.o: youtube.c youtube.h
 	$(CC) $(FLAGS) -c youtube.c
 
@@ -58,3 +55,6 @@ extract_text.o: extract_text.c extract_text.h
 install:
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(INSTALL) movgrab $(DESTDIR)$(bindir)
+
+test:
+	echo "no tests"

common.h

@@ -3,7 +3,7 @@
 #define MOVGRAB_COMMON
 
 //This is doable through autoconf, but I'm sick of fighting with it
-#define Version "3.1.2"
+#define Version "4.0"
 
 #include "libUseful/libUseful.h"
 #include <string.h>
@@ -32,6 +32,7 @@
 #define FLAG_POST 262144
 #define FLAG_PLAYER_AUTO 524288
 #define FLAG_NOOUT 1048576
+#define FLAG_DOWNLOAD_SIZE 2097152
 
 
 extern int Type, Flags;

display.c

@@ -8,7 +8,7 @@ extern char *CmdLine, *ProgName;
 
 
 
-int DisplayAvailableFormats(ListNode *Vars, char *Formats, int ShowSize)
+int DisplayAvailableFormats(ListNode *Vars, char *Formats)
 {
 char *URL=NULL, *Token=NULL, *TokenID=NULL, *Tempstr=NULL, *ptr;
 STREAM *S;
@@ -27,7 +27,7 @@ if (strcmp(Token,"reference") !=0)
 {
 	fprintf(stderr,"%s",Token);
 
-	if (ShowSize)
+	if (Flags & FLAG_DOWNLOAD_SIZE)
 	{
 	S=STREAMOpen(URL, "H");
 	if (S)

display.h

@@ -5,7 +5,7 @@
 
 extern int DisplayTitleWidth;
 
-int DisplayAvailableFormats(ListNode *Vars, char *Formats, int ShowSize);
+int DisplayAvailableFormats(ListNode *Vars, char *Formats);
 void DisplayProgress(const char *FullTitle, const char *Format, double bytes_read, double DocSize, int PrintName);
 
 #endif

libUseful/config.log

@@ -10,14 +10,14 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = columPC
-uname -m = x86_64
-uname -r = 5.1.15-64
+hostname = graphics
+uname -m = x86
+uname -r = 4.16.13-64
 uname -s = Linux
-uname -v = #1 SMP Mon Jul 1 14:00:23 BST 2019
+uname -v = #388 SMP Sat Feb 23 07:27:36 UTC 2019
 
 /usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
+/bin/uname -X     = 
 
 /bin/arch              = unknown
 /usr/bin/arch -k       = unknown
@@ -35,34 +35,40 @@ PATH: /bin
 PATH: /usr/games/bin
 PATH: .
 PATH: /opt/Csound-6.05/bin
-PATH: /opt/FLTK/bin
-PATH: /opt/Python-2.7.13/bin
+PATH: /opt/LibreCAD/bin
+PATH: /opt/Python-2.7.15/bin
+PATH: /opt/Python-3.5.6/bin
 PATH: /opt/Python-3.7.1/bin
 PATH: /opt/Qt5/bin
 PATH: /opt/SDL/bin
 PATH: /opt/SDL2/bin
+PATH: /opt/avr/bin
 PATH: /opt/blender-2.79b/bin
-PATH: /opt/boinc/bin
+PATH: /opt/boinc_client-7.14.2/bin
 PATH: /opt/brlcad-7.26.4/bin
 PATH: /opt/games/bin
-PATH: /opt/gdbm-1.14.1/bin
-PATH: /opt/ghostscript-9.23/bin
-PATH: /opt/git-2.17.0/bin
+PATH: /opt/gdbm-1.18.1/bin
+PATH: /opt/gifprogs-5.1.2/bin
+PATH: /opt/git-2.20.1/bin
+PATH: /opt/graphviz-2.40.1/bin
+PATH: /opt/inn-2.6.2/bin
 PATH: /opt/lua-5.3.4/bin
-PATH: /opt/lxc-3.0.1/bin
+PATH: /opt/luajid-2.0.4/bin
+PATH: /opt/lxc-3.0.3/bin
 PATH: /opt/mujs-1.0.5/bin
+PATH: /opt/net_snmp-5.8/bin
 PATH: /opt/netpbm-10.66.02/bin
 PATH: /opt/opengl/bin
 PATH: /opt/panda3d/bin
 PATH: /opt/perl-5.24.1/bin
-PATH: /opt/php-7.1.3/bin
-PATH: /opt/qemu-2.8.1/bin
-PATH: /opt/rustc-1.33.0/bin
-PATH: /opt/schily/bin
+PATH: /opt/qemu-2.8.1_SDL/bin
+PATH: /opt/qemu-3.1.0_SDL/bin
+PATH: /opt/ruby-2.5.2/bin
 PATH: /opt/squirrel-3.0/bin
-PATH: /opt/tcl-8.6.8/bin
+PATH: /opt/tcl-8.6.9/bin
 PATH: /opt/tinyscheme-1.41/bin
-PATH: /opt/wine-3.12/bin
+PATH: /opt/wine-3.21/bin
+PATH: /opt/wine-4.3/bin
 
 
 ## ----------- ##
@@ -74,7 +80,7 @@ configure:2213: found /usr/bin/gcc
 configure:2224: result: gcc
 configure:2453: checking for C compiler version
 configure:2462: gcc --version >&5
-gcc (GCC) 8.1.0
+gcc (GCC) 8.2.0
 Copyright (C) 2018 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -83,11 +89,11 @@ configure:2473: $? = 0
 configure:2462: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/8.1.0/lto-wrapper
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/i486-pc-linux-gnu/8.2.0/lto-wrapper
 Target: i486-pc-linux-gnu
-Configured with: ../gcc-8.1.0-src/configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu --enable-languages=c,c++,go --disable-nls --disable-multilib
+Configured with: ../gcc-8.2.0-src/configure --enable-languages=c,c++,go --disable-nls --disable-multilib --prefix=/usr --sysconfdir=/etc --includedir=/usr/include --localstatedir=/var --mandir=/usr/share/man --infodir=/usr/share/info --host=i486-pc-linux-gnu --build=i486-pc-linux-gnu --target=i486-pc-linux-gnu
 Thread model: posix
-gcc version 8.1.0 (GCC) 
+gcc version 8.2.0 (GCC) 
 configure:2473: $? = 0
 configure:2462: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
@@ -306,7 +312,7 @@ configure:4379: $? = 0
 configure:4388: result: yes
 configure:4406: checking for OpenSSL_add_all_algorithms
 configure:4406: gcc -o conftest -g -O2   conftest.c -lcrypto -lssl -lc -lc -lc -lc -lc -lc -lc -lc  >&5
-/tmp/cc6pj4xE.o: In function `main':
+/usr/lib/gcc/i486-pc-linux-gnu/8.2.0/../../../../i486-pc-linux-gnu/bin/ld: /tmp/ccKZxT6X.o: in function `main':
 /home/colum/movgrab/libUseful/conftest.c:63: undefined reference to `OpenSSL_add_all_algorithms'
 collect2: error: ld returned 1 exit status
 configure:4406: $? = 1
@@ -392,7 +398,7 @@ configure:4406: $? = 0
 configure:4406: result: yes
 configure:4406: checking for EVP_rc5_32_12_16_cbc
 configure:4406: gcc -o conftest -g -O2   conftest.c -lcrypto -lssl -lc -lc -lc -lc -lc -lc -lc -lc  >&5
-/tmp/ccCXjw2k.o: In function `main':
+/usr/lib/gcc/i486-pc-linux-gnu/8.2.0/../../../../i486-pc-linux-gnu/bin/ld: /tmp/ccwSLpQF.o: in function `main':
 /home/colum/movgrab/libUseful/conftest.c:66: undefined reference to `EVP_rc5_32_12_16_cbc'
 collect2: error: ld returned 1 exit status
 configure:4406: $? = 1
@@ -497,7 +503,7 @@ configure:4406: $? = 0
 configure:4406: result: yes
 configure:4406: checking for SSL_set_tlsext_host_name
 configure:4406: gcc -o conftest -g -O2   conftest.c -lcrypto -lssl -lc -lc -lc -lc -lc -lc -lc -lc  >&5
-/tmp/cceS7RX5.o: In function `main':
+/usr/lib/gcc/i486-pc-linux-gnu/8.2.0/../../../../i486-pc-linux-gnu/bin/ld: /tmp/ccC5S1Iu.o: in function `main':
 /home/colum/movgrab/libUseful/conftest.c:73: undefined reference to `SSL_set_tlsext_host_name'
 collect2: error: ld returned 1 exit status
 configure:4406: $? = 1
@@ -604,7 +610,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on columPC
+on graphics
 
 config.status:728: creating Makefile
 

main.c

@@ -96,6 +96,7 @@ while (1)
 		{
 			fprintf(stderr,"Checking %-20s ",Curr->Tag);
 			fflush(NULL);
+			LibUsefulSetValue("Error:Silent", "Y");
 		}
 
 

selectformat.c

@@ -42,7 +42,7 @@ return(FALSE);
 //this function compares the video formats found on the page to the list of
 //preferences expressed by the user with the '-f' flag, and contained in the
 //global variable 'Settings.FormatPreference'
-int SelectDownloadFormat(ListNode *Vars, int WebsiteType, int DisplaySize)
+int SelectDownloadFormat(ListNode *Vars, int WebsiteType)
 {
 ListNode *Curr;
 char *ptr, *Tempstr=NULL, *Fmt=NULL, *FmtID=NULL, *Selected=NULL, *p_ItemFormat;
@@ -53,7 +53,7 @@ Tempstr=GatherMatchingFormats(Tempstr,"",Vars);
 	{
 	for (i=0; i < 3; i++)
 	{
- 		if (DisplayAvailableFormats(Vars, Tempstr, DisplaySize)) break;
+ 		if (DisplayAvailableFormats(Vars, Tempstr)) break;
 		//printf("Connection Refused, sleeping for 20 secs before retry\n");
 		//sleep(10);
 		break;

selectformat.h

@@ -3,6 +3,6 @@
 
 #include "common.h"
 
-int SelectDownloadFormat(ListNode *Vars, int WebsiteType, int DisplaySize);
+int SelectDownloadFormat(ListNode *Vars, int WebsiteType);
 
 #endif