MacOS startup stuff moved to MacOS.c

diff --git a/MacOS.c b/MacOS.c
new file mode 100644 (file)
index 0000000..ff12428
--- /dev/null
+++ b/MacOS.c
@@ -0,0 +1,144 @@
+/*
+ * File MacOS.c
+ *
+ * This file need only be compiled on MacOS.
+ * It contains some functions only needed there:
+ *
+ * MaOSstartup(char *path)      : create working dir in "$HOME/Library/Application Support" etc.
+ *
+ * clock_gettime()              : MacOS implementation if it is not available
+ * clock_nanosleep()            : MacOS implementation
+ */
+
+#ifdef __APPLE__
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <uuid/uuid.h>
+
+void MacOSstartup(char *path) {
+//
+// We used to do this from a wrapper shell script.
+// However, this confuses MacOS when it comes to
+// granting access to the local microphone therefore
+// it is now built into the binary
+//
+// We have to distinguish two basic situations:
+//
+// a) piHPSDR is called from a command line
+// b) piHPSDR is within an app bundle
+//
+// In case a) nothing has to be done here (standard UNIX),
+// but in case b) we do the following:
+//
+// - if not yet existing, create the directory "$HOME/Library/Application Support/piHPSDR"
+// - copy the icon to that directory
+// - chdir to that directory
+//
+// Case b) is present if the current working directory is "/".
+//
+// If "$HOME/Library/Application Support" does not exist, fall back to case a)
+//
+    char *c;
+    char source[1024];
+    char workdir[1024];
+    char *homedir;
+    const char *AppSupport ="/Library/Application Support/piHPSDR";
+    const char *IconInApp  ="/../Resources/hpsdr.png";
+    struct stat st;
+    int fdin, fdout;
+    int rc;
+    FILE *fpout;
+    fpout=fopen("/Users/chwu/Desktop/out.log", "w");
+    fprintf(fpout,"LOG\n"); fflush(fpout);
+//
+//  If the current work dir is NOT "/", just do nothing
+//    
+    *workdir=0;
+    c=getcwd(workdir,sizeof(workdir));
+    fprintf(fpout,"START CWD=%s len=%d\n", workdir, (int) strlen(workdir)); fflush(fpout);
+    if (strlen(workdir) != 1 || *workdir != '/') return;
+
+//
+//  Determine working directory,
+//  "$HOME/Library/Application Support/piHPSDR"
+//  and create it if it does not exist
+//  take care to enclose name with quotation marks
+//
+    if ((homedir = getenv("HOME")) == NULL) {
+      homedir = getpwuid(getuid())->pw_dir;
+    }
+    fprintf(fpout,"HOMEDIR=%s\n", homedir); fflush(fpout);
+    if (strlen(homedir) +strlen(AppSupport) > 1020) return;
+    strcpy(workdir,homedir);
+    strcat(workdir, AppSupport);
+    fprintf(fpout,"WORKDIR=%s\n", workdir); fflush(fpout);
+
+//
+//  Check if working dir exists, otherwise try to create it
+//
+    if (stat(workdir, &st) < 0) {
+      fprintf(fpout,"TRY MAKE\n"); fflush(fpout),
+      mkdir(workdir, 0755);
+    }
+//
+//  Is it there? If not, give up
+//
+    if (stat(workdir, &st) < 0) {
+      fprintf(fpout,"NOT THERE\n"); fflush(fpout);
+      return;
+    }
+//
+//  Is it a directory? If not, give up
+//
+    if ((st.st_mode & S_IFDIR) == 0) {
+      fprintf(fpout,"NO DIR\n"); fflush(fpout);
+      return;
+    }
+//
+//  chdir to the work dir
+//
+    chdir(workdir);
+    c=getcwd(workdir,sizeof(workdir));
+    fprintf(fpout,"NOW CWD=%s len=%d\n", workdir, (int) strlen(workdir)); fflush(fpout);
+//
+//  Copy icon from app bundle to the work dir
+//
+    if (strlen(path) < 1024) {
+      //
+      // source = basename of the executable
+      //
+      strcpy(source, path);
+      c=rindex(source,'/');
+      if (c) {
+        *c=0;
+        if ((strlen(source) + strlen(IconInApp) < 1024)) {
+          strcat(source,  IconInApp);
+          //
+          // Now copy the file from "source" to "workdir"
+          //
+          fdin=open(source, O_RDONLY);
+          fdout=open("hpsdr.png", O_WRONLY | O_CREAT | O_TRUNC, (mode_t) 0400);
+          if (fdin >= 0 && fdout >= 0) {
+            //
+            // Now do the copy, use "source" as I/O buffer
+            //
+            while ((rc=read(fdin, source, 1024)) > 0) {
+              write (fdout, source, rc);
+            }
+            close(fdin);
+            close(fdout);
+          }
+        }
+      }
+    }
+    fclose(fpout);
+}
+
+#endif

diff --git a/main.c b/main.c
index 33de387acec26018c16837c2c0b58042179425d2..8e094ebfc07e5445f7461f66e208d543050b6d92 100644 (file)
--- a/main.c
+++ b/main.c
@@ -352,76 +352,3 @@ int main(int argc,char **argv) {
   g_object_unref(pihpsdr);
   return status;
 }
-
-#ifdef __APPLE__
-void MacOSstartup(char *path) {
-//
-// We used to do this from a wrapper shell script.
-// However, this confuses MacOS when it comes to
-// granting access to the local microphone therefore
-// it is now built into the binary
-//
-// We have to distinguish two basic situations:
-//
-// a) piHPSDR is called from a command line
-// b) piHPSDR is within an app bundle
-//
-// In case a) nothing has to be done here (standard UNIX),
-// but in case b) we do the following:
-//
-// - if not yet existing, create the directory "$HOME/Library/Application Support/piHPSDR"
-// - copy the icon to that directory
-// - chdir to that directory
-//
-// Case b) is present if the current working directory is "/".
-//
-    char *c;
-    char dir[1024];
-    char cmd[1024];
-    char workdir[1024];
-
-//
-//  If the current work dir is NOT "/", just do nothing
-//    
-    c=getcwd(dir,sizeof(dir));
-    if (strcmp(dir,"/")) return;
-
-//
-//  Determine working directory,
-//  "$HOME/Library/Application Support/piHPSDR"
-//  and create it if it does not exist
-//  take care to enclose name with quotation marks
-//
-    c=getenv("HOME");
-    if (c == NULL) return;
-    strcpy(workdir, c);
-    strcat(workdir, "/Library/Application Support/piHPSDR");
-    strcpy(cmd,"mkdir -p \"");
-    strcat(cmd, workdir);
-    strcat(cmd, "\"");
-    system(cmd);
-
-//
-//  Determine path to executable and its base dir
-//
-    strcpy(dir, path);
-    c=rindex(dir,'/');
-    if (c) *c=0;
-
-//
-//  Copy icon from app bundle to the work dir
-//  take care to enclose file names with quotation marks
-//
-    strcpy(cmd,"cp \"");
-    strcat(cmd, dir);
-    strcat(cmd, "/../Resources/hpsdr.png\" \"");
-    strcat(cmd, workdir);
-    strcat(cmd, "\"");
-    system(cmd);
-
-//
-//  chdir to the work dir
-//
-    chdir(workdir);
-}
-#endif