Merge pull request #17 from viveris/master

Upstream sync

Author: devangpatel

.github/workflows/ccpp.yml

@@ -1,13 +1,21 @@
 name: C/C++ CI
 
-on: [push]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-    
     steps:
     - uses: actions/checkout@v1
     - name: make
-      run: make
+      run: |
+        make
+        make clean
+        make DEBUG=1
+        sudo apt-get install libsystemd-dev
+        make clean
+        make SYSTEMD=1
+        make clean
+        make USE_SYSLOG=1
+        make clean
+        make OLD_FUNCTIONFS_DESCRIPTORS=1

Makefile

@@ -1,4 +1,5 @@
-CFLAGS += -I./inc -lpthread -Wall
+CFLAGS += -I./inc -Wall
+LDFLAGS += -lpthread -lrt
 
 sources := $(wildcard src/*.c)
 objects := $(sources:src/%.c=obj/%.o)
@@ -29,7 +30,7 @@ endif
 all: umtprd
 
 umtprd: $(objects) $(ops_objects)
-	${CC} -o $@    $^ $(LDFLAGS) -lpthread
+	${CC} -o $@    $^ $(LDFLAGS)
 
 $(objects): obj/%.o: src/%.c | output_dir
 	${CC} -o $@ $^ -c $(CPPFLAGS) $(CFLAGS)

inc/logs_out.h

@@ -63,42 +63,42 @@ void timestamp(char * timestr, int maxsize);
 
 #else // Stdout usage
 
-#define PRINT_MSG(fmt, args...)   {                                 \
+#define PRINT_MSG(fmt, args...)   do {                              \
                                     char timestr[32];               \
                                     timestamp((char*)&timestr, sizeof(timestr)); \
                                     fprintf(stdout,                 \
                                             "[uMTPrd - %s - Info] " fmt "\n",(char*)&timestr, \
                                             ## args);               \
                                     fflush(stdout);                 \
-                                  }
+                                  } while (0)
 
-#define PRINT_ERROR(fmt, args...) {                                 \
+#define PRINT_ERROR(fmt, args...) do {                              \
                                     char timestr[32];               \
                                     timestamp((char*)&timestr, sizeof(timestr)); \
                                     fprintf(stderr,                 \
                                             "[uMTPrd - %s - Error] " fmt "\n",(char*)&timestr, \
                                             ## args);               \
                                     fflush(stderr);                 \
-                                  }
+                                  } while (0)
 
-#define PRINT_WARN(fmt, args...)  {                                 \
+#define PRINT_WARN(fmt, args...)  do {                              \
                                     char timestr[32];               \
                                     timestamp((char*)&timestr, sizeof(timestr)); \
                                     fprintf(stdout,                 \
                                             "[uMTPrd - %s - Warning] " fmt "\n",(char*)&timestr, \
                                             ## args);               \
                                     fflush(stdout);                 \
-                                  }
+                                  } while (0)
 
 #ifdef DEBUG
-#define PRINT_DEBUG(fmt, args...) {                                 \
+#define PRINT_DEBUG(fmt, args...) do {                              \
                                     char timestr[32];               \
                                     timestamp((char*)&timestr, sizeof(timestr)); \
                                     fprintf(stdout,                 \
                                             "[uMTPrd - %s - Debug] " fmt "\n",(char*)&timestr, \
                                             ## args);               \
                                     fflush(stdout);                 \
-                                  }
+                                  } while (0)
 #else
 
 #define PRINT_DEBUG(fmt, args...)

inc/msgqueue.h

@@ -1,4 +1,6 @@
+#include <mqueue.h>
+
 int msgqueue_handler_init( mtp_ctx * ctx );
 int msgqueue_handler_deinit( mtp_ctx * ctx );
-
+mqd_t get_message_queue();
 int send_message_queue( char * message );

src/inotify.c

@@ -30,6 +30,7 @@
 #include <pthread.h>
 #include <string.h>
 #include <sys/inotify.h>
+#include <sys/prctl.h>
 #include <unistd.h>
 #include <signal.h>
 
@@ -88,12 +89,12 @@ static int get_file_info(mtp_ctx * ctx, const struct inotify_event *event, fs_en
 	return 0;
 }
 
-void *inotify_gotsig(int sig, siginfo_t *info, void *ucontext)
+static void *inotify_gotsig(int sig, siginfo_t *info, void *ucontext)
 {
 	return NULL;
 }
 
-void* inotify_thread(void* arg)
+static void* inotify_thread(void* arg)
 {
 	mtp_ctx * ctx;
 	int i, length;
@@ -109,6 +110,8 @@ void* inotify_thread(void* arg)
 	const struct inotify_event *event;
 	struct sigaction sa;
 
+	prctl(PR_SET_NAME, (unsigned long) __func__);
+
 	ctx = (mtp_ctx *)arg;
 
 	sa.sa_handler = NULL;