Make pktriggercord-cli compile on Windows using RAD Studio 10.3 (asalamon74#47)

Author: FrankBijnen

Changelog

@@ -1,4 +1,5 @@
 version 0.85.01
+	RAD10 compilation (thx FrankBijnen)
 	Exposure mode conversion bugfix (thx blemasle)
 	Testing status reader for KP
 	Settings reading for K5II (thx blemasle)

Makefile

@@ -45,7 +45,7 @@ MANS = pktriggercord-cli.1 pktriggercord.1
 SRCOBJNAMES = pslr pslr_enum pslr_scsi pslr_lens pslr_model pktriggercord-servermode
 OBJS = $(SRCOBJNAMES:=.o) $(JSONDIR)/js0n.o
 WIN_DLLS_DIR=win_dlls
-SOURCE_PACKAGE_FILES = Makefile Changelog COPYING INSTALL BUGS $(MANS) pentax_scsi_protocol.md pentax.rules samsung.rules $(SRCOBJNAMES:=.h) $(SRCOBJNAMES:=.c) pslr_scsi_linux.c pslr_scsi_win.c pslr_scsi_openbsd.c exiftool_pentax_lens.txt pktriggercord.c pktriggercord-cli.c pktriggercord.ui pentax_settings.json $(SPECFILE) android_scsi_sg.h src/
+SOURCE_PACKAGE_FILES = Makefile Changelog COPYING INSTALL BUGS $(MANS) pentax_scsi_protocol.md pentax.rules samsung.rules $(SRCOBJNAMES:=.h) $(SRCOBJNAMES:=.c) pslr_scsi_linux.c pslr_scsi_win.c pslr_scsi_openbsd.c exiftool_pentax_lens.txt pktriggercord.c pktriggercord-cli.c pktriggercord.ui pentax_settings.json $(SPECFILE) android_scsi_sg.h rad10/ src/
 TARDIR = pktriggercord-$(VERSION)
 SRCZIP = pkTriggerCord-$(VERSION).src.tar.gz
 

pktriggercord-cli.c

@@ -32,14 +32,21 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#ifdef RAD10
+#include <utime.h>
+#include <io.h>
+#include "tdbtimes.h"
+#include "getopt.h"
+#else
 #include <unistd.h>
 #include <getopt.h>
+#include <sys/time.h>
+#endif
 #include <fcntl.h>
 #include <ctype.h>
 #include <time.h>
 #include <stdarg.h>
 #include <math.h>
-#include <sys/time.h>
 
 #include "pslr.h"
 #include "pktriggercord-servermode.h"
@@ -61,7 +68,11 @@ bool astrotracer_before=false;
 bool need_bulb_new_cleanup=false;
 bool need_one_push_bracketing_cleanup=false;
 
+#ifdef RAD10
+static option const longopts[] = {
+#else
 static struct option const longopts[] = {
+#endif
     {"exposure_mode", required_argument, NULL, 'm'},
     {"resolution", required_argument, NULL, 'r'},
     {"quality", required_argument, NULL, 'q'},

pktriggercord-servermode.c

@@ -26,17 +26,23 @@
     and GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#ifdef RAD10
+#include <windows.h>
+#include <utime.h>
+#include "tdbtimes.h"
+#else
+#include <sys/time.h>
+#include <unistd.h>
+#endif
 #ifndef WIN32
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #endif
 
 #include <stdio.h>
-#include <sys/time.h>
 #include <stdlib.h>
 
-#include <unistd.h>
 
 #include "pslr.h"
 #include "pslr_lens.h"

pslr.c

@@ -41,7 +41,13 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
+#ifdef RAD10
+#include <windows.h>
+#include <utime.h>
+#include "tdbtime.h"
+#else
 #include <unistd.h>
+#endif
 #include <stdbool.h>
 #include <stdarg.h>
 #include <dirent.h>

pslr_model.c

@@ -39,8 +39,12 @@
 #include <string.h>
 #include <stdbool.h>
 #include <fcntl.h>
+#ifndef RAD10
 #include <unistd.h>
+#endif
 #include "js0n.h"
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "pslr_model.h"
 #include "pslr.h"
@@ -50,6 +54,16 @@ static int first = 1;
 static char *jsontext=NULL;
 static int jsonsize;
 
+static int dir_exists(char *dir) {
+    int res = 0;
+    struct stat info;
+
+    if ( (stat(dir, &info) == 0) && (info.st_mode & S_IFDIR) ) {
+        res = 1;
+    }
+    return res;
+}
+
 static void ipslr_status_diff(uint8_t *buf) {
     int n;
     int diffs;
@@ -779,7 +793,9 @@ char *read_json_file(int *jsonsize) {
     int jsonfd = open("pentax_settings.json", O_RDONLY);
     if (jsonfd == -1) {
         // cannot find in the current directory, also checking PKTDATADIR
-        jsonfd = open(PKTDATADIR "/pentax_settings.json", O_RDONLY);
+        if (dir_exists(PKTDATADIR)) {
+            jsonfd = open(PKTDATADIR "/pentax_settings.json", O_RDONLY);
+        }
         if (jsonfd == -1) {
             fprintf(stderr, "Cannot open pentax_settings.json file\n");
             return NULL;

pslr_scsi.c

@@ -23,8 +23,7 @@
     and GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifdef WIN32
+#if defined(WIN32) || defined(RAD10)
 #include "pslr_scsi_win.c"
 #else
 /* Ugly hack. More generic ifs required */

pslr_scsi.h

@@ -35,6 +35,9 @@
 extern bool debug;
 extern void write_debug( const char* message, ... );
 
+#ifdef RAD10
+#include <windows.h>
+#endif
 #ifdef ANDROID
 #include <android/log.h>
 #define DPRINT(...) __android_log_print(ANDROID_LOG_DEBUG, "PkTriggerCord", __VA_ARGS__)

pslr_scsi_win.c

@@ -68,6 +68,21 @@ char **get_drives(int *driveNum) {
     int driveLetter;
     int j=0;
     for ( driveLetter = 'C'; driveLetter<='Z'; ++driveLetter ) {
+#ifdef RAD10
+// These Drive types cant be a Pentax. The RAD10 debugger breaks here.
+        TCHAR root[4];
+        snprintf(root, 4, "%c:\\", driveLetter);
+        switch (GetDriveType(root)) {
+            case  DRIVE_UNKNOWN:
+            case  DRIVE_NO_ROOT_DIR:
+            case  DRIVE_FIXED:
+            case  DRIVE_REMOTE:
+            case  DRIVE_CDROM:
+                continue;
+            default:
+                ;
+        }
+#endif
         ret[j] = malloc( 2 * sizeof (char) );
         snprintf(ret[j], 2, "%c", driveLetter);
         ++j;