Merge pull request #352 from darealshinji/appimagetool_master_patch1

Code clean-up

Author: probonopd

AppRun.c

@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
     if (!appdir)
         die("Could not access /proc/self/exe\n");
 
-    char path[LINE_SIZE];
     int ret;
 
     struct dirent **namelist;
@@ -74,7 +73,7 @@ int main(int argc, char *argv[])
     f = fopen(desktop_file, "r");
 
     char *line = malloc(LINE_SIZE);
-    unsigned int n = LINE_SIZE;
+    size_t n = LINE_SIZE;
     int found = 0;
 
     while (getline(&line, &n, f) != -1)

appimaged.c

@@ -68,7 +68,7 @@ static GOptionEntry entries[] =
     { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL },
     { "install", 'i', 0, G_OPTION_ARG_NONE, &install, "Install this appimaged instance to $HOME", NULL },
     { "uninstall", 'u', 0, G_OPTION_ARG_NONE, &uninstall, "Uninstall an appimaged instance from $HOME", NULL },
-    { "version", NULL, 0, G_OPTION_ARG_NONE, &version, "Show version number", NULL },
+    { "version", 0, 0, G_OPTION_ARG_NONE, &version, "Show version number", NULL },
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args, NULL },
     { NULL }
 };
@@ -153,11 +153,11 @@ void initially_register(const char *name, int level)
                 }
             }
         }
-    } while (entry = readdir(dir));
+    } while ((entry = readdir(dir)) != NULL);
     closedir(dir);
 }
 
-int add_dir_to_watch(char *directory)
+void add_dir_to_watch(char *directory)
 {
     if (g_file_test (directory, G_FILE_TEST_IS_DIR)){
         if(!inotifytools_watch_recursively(directory, WR_EVENTS) ) {
@@ -174,7 +174,7 @@ void handle_event(struct inotify_event *event)
     int ret;
     gchar *absolute_path = g_build_path(G_DIR_SEPARATOR_S, inotifytools_filename_from_wd(event->wd), event->name, NULL);
 
-    if(event->mask & IN_CLOSE_WRITE | event->mask & IN_MOVED_TO){
+    if((event->mask & IN_CLOSE_WRITE) | (event->mask & IN_MOVED_TO)){
         if(g_file_test(absolute_path, G_FILE_TEST_IS_REGULAR)){
             pthread_t some_thread;
             struct arg_struct args;
@@ -188,7 +188,7 @@ void handle_event(struct inotify_event *event)
         }
     }
 
-    if(event->mask & IN_MOVED_FROM | event->mask & IN_DELETE){
+    if((event->mask & IN_MOVED_FROM) | (event->mask & IN_DELETE)){
         pthread_t some_thread;
         struct arg_struct args;
         args.path = absolute_path;
@@ -237,7 +237,7 @@ int main(int argc, char ** argv) {
 
     gchar *user_bin_dir = g_build_filename(g_get_home_dir(), "/.local/bin", NULL);
     gchar *installed_appimaged_location = g_build_filename(user_bin_dir, "appimaged", NULL);
-    gchar *appimage_location = g_getenv("APPIMAGE");
+    const gchar *appimage_location = g_getenv("APPIMAGE");
     gchar *own_desktop_file_location = g_build_filename(g_getenv("APPDIR"), "/appimaged.desktop", NULL);
     gchar *global_autostart_file = "/etc/xdg/autostart/appimaged.desktop";
     gchar *global_systemd_file = "/usr/lib/systemd/user/appimaged.service";
@@ -254,7 +254,7 @@ int main(int argc, char ** argv) {
         exit(0);
     }
 
-    if(install != NULL){
+    if(install){
         if(((appimage_location != NULL)) && ((own_desktop_file_location != NULL))){
             printf("Running from within %s\n", appimage_location);
             if ( (! g_file_test ("/usr/bin/appimaged", G_FILE_TEST_EXISTS)) && (! g_file_test (global_autostart_file, G_FILE_TEST_EXISTS)) && (! g_file_test (global_systemd_file, G_FILE_TEST_EXISTS))){
@@ -297,7 +297,7 @@ int main(int argc, char ** argv) {
         if ( (! g_file_test ("/usr/bin/appimaged", G_FILE_TEST_EXISTS)) && ((! g_file_test (global_autostart_file, G_FILE_TEST_EXISTS)) || (! g_file_test (destination, G_FILE_TEST_EXISTS))) && (! g_file_test (global_systemd_file, G_FILE_TEST_EXISTS)) && (! g_file_test (installed_appimaged_location, G_FILE_TEST_EXISTS)) && (g_file_test (own_desktop_file_location, G_FILE_TEST_IS_REGULAR))){
             char *title;
             char *body;
-            title = g_strdup_printf("Not installed\n", argv[0]);
+            title = g_strdup_printf("Not installed\n");
             body = g_strdup_printf("Please run %s --install", argv[0]);
             notify(title, body, 15);
             exit(1);

appimagetool.c

@@ -27,6 +27,7 @@
 #ident "AppImage by Simon Peter, http://appimage.org/"
 
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
@@ -41,9 +42,6 @@
 #include <sys/wait.h>
 
 #include "binreloc.h"
-#ifndef NULL
-#define NULL ((void *) 0)
-#endif
 
 #include <libgen.h>
 
@@ -57,8 +55,6 @@ extern int _binary_runtime_start;
 extern int _binary_runtime_end;
 
 
-static gint repeats = 2;
-static gint max_size = 8;
 static gboolean list = FALSE;
 static gboolean verbose = FALSE;
 static gboolean version = FALSE;
@@ -107,7 +103,6 @@ int sfs_ls(char* image) {
 /* Generate a squashfs filesystem using mksquashfs on the $PATH 
 * execlp(), execvp(), and execvpe() search on the $PATH */
 int sfs_mksquashfs(char *source, char *destination, int offset) {
-    pid_t parent = getpid();
     pid_t pid = fork();
 
     if (pid == -1) {
@@ -169,17 +164,16 @@ gchar* find_first_matching_file(const gchar *real_path, const gchar *pattern) {
             }
         }
         g_dir_close(dir);
-        return NULL;
     }
     else {
         g_warning("%s: %s", real_path, g_strerror(errno));
     }
+    return NULL;
 }
 
 gchar* find_first_matching_file_nonrecursive(const gchar *real_path, const gchar *pattern) {
     GDir *dir;
     gchar *full_name;
-    gchar *resulting;
     dir = g_dir_open(real_path, 0, NULL);
     if (dir != NULL) {
         const gchar *entry;
@@ -191,11 +185,11 @@ gchar* find_first_matching_file_nonrecursive(const gchar *real_path, const gchar
             }
         }
         g_dir_close(dir);
-        return NULL;
     }
     else { 
         g_warning("%s: %s", real_path, g_strerror(errno));
     }
+    return NULL;
 }
 
 gchar* get_desktop_entry(GKeyFile *kf, char *key) {
@@ -233,15 +227,14 @@ static void replacestr(char *line, const char *search, const char *replace)
 
 static GOptionEntry entries[] =
 {
-    // { "repeats", 'r', 0, G_OPTION_ARG_INT, &repeats, "Average over N repetitions", "N" },
     { "list", 'l', 0, G_OPTION_ARG_NONE, &list, "List files in SOURCE AppImage", NULL },
     { "updateinformation", 'u', 0, G_OPTION_ARG_STRING, &updateinformation, "Embed update information STRING; if zsyncmake is installed, generate zsync file", NULL },
-    { "bintray-user", NULL, 0, G_OPTION_ARG_STRING, &bintray_user, "Bintray user name", NULL },
-    { "bintray-repo", NULL, 0, G_OPTION_ARG_STRING, &bintray_repo, "Bintray repository", NULL },
-    { "version", NULL, 0, G_OPTION_ARG_NONE, &version, "Show version number", NULL },
+    { "bintray-user", 0, 0, G_OPTION_ARG_STRING, &bintray_user, "Bintray user name", NULL },
+    { "bintray-repo", 0, 0, G_OPTION_ARG_STRING, &bintray_repo, "Bintray repository", NULL },
+    { "version", 0, 0, G_OPTION_ARG_NONE, &version, "Show version number", NULL },
     { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Produce verbose output", NULL },
     { "sign", 's', 0, G_OPTION_ARG_NONE, &sign, "Sign with gpg2", NULL },
-    { "comp", NULL, 0, G_OPTION_ARG_STRING, &sqfs_comp, "Squashfs compression", NULL }, 
+    { "comp", 0, 0, G_OPTION_ARG_STRING, &sqfs_comp, "Squashfs compression", NULL },
     { "no-appstream", 'n', 0, G_OPTION_ARG_NONE, &no_appstream, "Do not check AppStream metadata", NULL },
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args, NULL },
     { NULL }
@@ -579,7 +572,7 @@ main (int argc, char *argv[])
             }
         }
 
-        if(sign != NULL){
+        if(sign){
             /* The user has indicated that he wants to sign */
             gchar *gpg2_path = g_find_program_in_path ("gpg2");
             gchar *sha256sum_path = g_find_program_in_path ("sha256sum");

build.sh

@@ -4,6 +4,8 @@
 # and builds AppImage
 #
 
+CC="cc -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result"
+
 STATIC_BUILD=1
 INSTALL_DEPENDENCIES=1
 
@@ -78,7 +80,7 @@ if [ $STATIC_BUILD -eq 1 ]; then
     cd openssl-1.1.0c
     mkdir -p build/lib
     ./config --prefix=`pwd`/build
-    make && make install
+    make && make install PROCESS_PODS=''
     cd -
     rm openssl-1.1.0c/build/lib/*.so*
   fi
@@ -147,7 +149,7 @@ cp ../squashfs-tools/squashfs-tools/mksquashfs .
 
 # Compile runtime but do not link
 
-cc -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" -I../squashfuse/ -D_FILE_OFFSET_BITS=64 -g -Os -c ../runtime.c
+$CC -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" -I../squashfuse/ -D_FILE_OFFSET_BITS=64 -g -Os -c ../runtime.c
 
 # Prepare 1024 bytes of space for updateinformation
 printf '\0%.0s' {0..1023} > 1024_blank_bytes
@@ -160,7 +162,9 @@ objcopy --add-section .sha256_sig=1024_blank_bytes \
 
 # Now statically link against libsquashfuse_ll, libsquashfuse and liblzma
 # and embed .upd_info and .sha256_sig sections
-cc ../elf.c ../notify.c ../getsection.c runtime3.o ../squashfuse/.libs/libsquashfuse_ll.a ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -L../xz-5.2.3/build/lib -Wl,-Bdynamic -lfuse -lpthread -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic -ldl -o runtime
+$CC -o runtime ../elf.c ../notify.c ../getsection.c runtime3.o \
+    ../squashfuse/.libs/libsquashfuse_ll.a ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a \
+    -L../xz-5.2.3/build/lib -Wl,-Bdynamic -lfuse -lpthread -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic -ldl
 strip runtime
 
 # Test if we can read it back
@@ -195,15 +199,23 @@ ld -r -b binary -o data.o runtime
 
 # Compile appimagetool but do not link - glib version
 
-cc -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" -D_FILE_OFFSET_BITS=64 -I../squashfuse/ $(pkg-config --cflags glib-2.0) -g -Os ../getsection.c  -c ../appimagetool.c
+$CC -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" -D_FILE_OFFSET_BITS=64 -I../squashfuse/ \
+    $(pkg-config --cflags glib-2.0) -g -Os ../getsection.c  -c ../appimagetool.c
 
 # Now statically link against libsquashfuse - glib version
 if [ $STATIC_BUILD -eq 1 ]; then
   # statically link against liblzma
-  cc data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -L../xz-5.2.3/build/lib -Wl,-Bdynamic -lfuse -lpthread -lglib-2.0 $(pkg-config --cflags glib-2.0) -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic -o appimagetool # liblz4
+  $CC -o appimagetool data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c \
+    ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a \
+    -L../xz-5.2.3/build/lib \
+    -Wl,-Bdynamic -lfuse -lpthread \
+    -Wl,--as-needed $(pkg-config --cflags --libs glib-2.0) -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic
 else
   # dinamically link against distro provided liblzma
-  cc data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -Wl,-Bdynamic -lfuse -lpthread -lglib-2.0 $(pkg-config --cflags glib-2.0) -lz -llzma -o appimagetool # liblz4
+  $CC -o appimagetool data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c \
+    ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a \
+    -Wl,-Bdynamic -lfuse -lpthread \
+    -Wl,--as-needed $(pkg-config --cflags --libs glib-2.0) -lz -llzma
 fi
 
 # Version without glib
@@ -213,25 +225,28 @@ fi
 # Compile and link digest tool
 
 if [ $STATIC_BUILD -eq 1 ]; then
-  cc -o digest ../getsection.c ../digest.c -I../openssl-1.1.0c/build/include -L../openssl-1.1.0c/build/lib -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -lz -ldl
+  $CC -o digest ../getsection.c ../digest.c -I../openssl-1.1.0c/build/include -L../openssl-1.1.0c/build/lib \
+    -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -lz -ldl
 else
-  cc -o digest ../getsection.c ../digest.c -Wl,-Bdynamic -lssl -lcrypto -lz -ldl
+  $CC -o digest ../getsection.c ../digest.c -Wl,-Bdynamic -lssl -lcrypto -lz -ldl
 fi
 
 strip digest
 
 # Compile and link validate tool
 
 if [ $STATIC_BUILD -eq 1 ]; then
-  cc -o validate ../getsection.c ../validate.c -I../openssl-1.1.0c/build/include -L../openssl-1.1.0c/build/lib -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -lglib-2.0 $(pkg-config --cflags glib-2.0) -lz -ldl
+  $CC -o validate ../getsection.c ../validate.c -I../openssl-1.1.0c/build/include -L../openssl-1.1.0c/build/lib \
+    -Wl,-Bstatic -lssl -lcrypto -Wl,-Bdynamic -Wl,--as-needed $(pkg-config --cflags --libs glib-2.0) -lz -ldl
 else
-  cc -o validate ../getsection.c ../validate.c -Wl,-Bdynamic -lssl -lcrypto -lglib-2.0 $(pkg-config --cflags glib-2.0) -lz -ldl
+  $CC -o validate ../getsection.c ../validate.c -Wl,-Bdynamic -lssl -lcrypto \
+    -Wl,--as-needed $(pkg-config --cflags --libs glib-2.0) -lz -ldl
 fi
 
 strip validate
 
 # AppRun
-cc ../AppRun.c -o AppRun
+$CC ../AppRun.c -o AppRun
 
 # check for libarchive name
 have_libarchive3=0
@@ -244,9 +259,26 @@ rm -f a.out
 
 # appimaged, an optional component
 if [ $STATIC_BUILD -eq 1 ]; then
-  cc -std=gnu99 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBARCHIVE3=$have_libarchive3 -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" ../getsection.c ../notify.c -Wl,-Bdynamic ../elf.c ../appimaged.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -I../squashfuse/ -L../xz-5.2.3/build/lib -I../inotify-tools-3.14/build/include -L../inotify-tools-3.14/build/lib -Wl,-Bstatic -linotifytools -Wl,-Bdynamic -larchive${archive_n} $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --libs gio-2.0) $(pkg-config --libs --cflags cairo) -ldl -lpthread -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic -o appimaged # liblz4
+  $CC -std=gnu99 -o appimaged -I../squashfuse/ ../getsection.c ../notify.c ../elf.c ../appimaged.c \
+    -D_FILE_OFFSET_BITS=64 -DHAVE_LIBARCHIVE3=$have_libarchive3 -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" \
+    ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a \
+    -L../xz-5.2.3/build/lib -I../inotify-tools-3.14/build/include -L../inotify-tools-3.14/build/lib \
+    -Wl,-Bstatic -linotifytools -Wl,-Bdynamic -larchive${archive_n} \
+    -Wl,--as-needed \
+    $(pkg-config --cflags --libs glib-2.0) \
+    $(pkg-config --cflags --libs gio-2.0) \
+    $(pkg-config --cflags --libs cairo) \
+    -ldl -lpthread -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic
 else
-  cc -std=gnu99 -D_FILE_OFFSET_BITS=64 -DHAVE_LIBARCHIVE3=$have_libarchive3 -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" ../getsection.c ../notify.c -Wl,-Bdynamic ../elf.c ../appimaged.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -I../squashfuse/ -Wl,-Bdynamic -linotifytools -larchive${archive_n} $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --libs gio-2.0) $(pkg-config --libs --cflags cairo) -ldl -lpthread -lz -llzma -o appimaged # liblz4
+  $CC -std=gnu99 -o appimaged -I../squashfuse/ ../getsection.c ../notify.c ../elf.c ../appimaged.c \
+    -D_FILE_OFFSET_BITS=64 -DHAVE_LIBARCHIVE3=$have_libarchive3 -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" \
+    ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a \
+    -Wl,-Bdynamic -linotifytools -larchive${archive_n} \
+    -Wl,--as-needed \
+    $(pkg-config --cflags --libs glib-2.0) \
+    $(pkg-config --cflags --libs gio-2.0) \
+    $(pkg-config --cflags --libs cairo) \
+    -ldl -lpthread -lz -llzma
 fi
 
 cd ..

digest.c

@@ -92,7 +92,10 @@ int sha256_file(char *path, char outputBuffer[65], int skip_offset, int skip_len
     return 0;
 }
 
-int main(int argc,char **argv)	{
+int main(int argc,char **argv)
+{
+    int res = 0;
+
         if(argc < 2){
             fprintf(stderr, "Usage: %s file offset length\n", argv[0]);
             fprintf(stderr, "If no offset and length are provided, the ELF section '%s' is skipped\n\n", segment_name);            
@@ -124,8 +127,8 @@ int main(int argc,char **argv)	{
         fprintf(stderr, "offset+length cannot be less than the file size\n");
         exit(1);
     }
-	static unsigned char buffer[65];
-	int res = sha256_file(filename, buffer, skip_offset, skip_length);
+	static char buffer[65];
+	res = sha256_file(filename, buffer, skip_offset, skip_length);
 	printf("%s\n", buffer);
 	return res;
 }