Changeset 8385

Timestamp:

Aug 16, 2006, 9:14:42 AM (20 years ago)

Author:

eugene

Message:

added check_dir_access, removed unused variables

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/CommOps.c (modified) (1 diff)
• src/IOBufferOps.c (modified) (1 diff)
• src/findexec.c (modified) (3 diffs)
• src/time.c (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana.h

@@ -125 +125 @@
 void    make_backup            PROTO((char *filename));
 int     check_file_access      PROTO((char *basefile, int backup, int verbose));
+int     check_dir_access       PROTO((char *path, int verbose));
 int     check_file_exec        PROTO((char *filename));
 

trunk/Ohana/src/libohana/src/CommOps.c

@@ -74 +74 @@
 int SendMessage (int device, char *format, ...) {
 
-  int Nbyte, status;
+  int Nbyte;
   char tmp;
   va_list argp;  

trunk/Ohana/src/libohana/src/IOBufferOps.c

@@ -102 +102 @@
   /* add the output line to the given IOBuffer */
   
-  int Nbyte, status;
-  char tmp, *line;
+  int Nbyte;
+  char tmp;
 
   Nbyte = vsnprintf (&tmp, 0, format, argp);

trunk/Ohana/src/libohana/src/findexec.c

@@ -25 +25 @@
 }
 
-/* check that file can be written to:
+/* check that:
    - dir exists
    - dir permissions OK
-   - file permissions OK, 
-   - file backup permission OK (optional)
-*/
-int check_file_access (char *basefile, int BACKUP, int VERBOSE) {
-  
-  char *path, *filename;
+*/
+int check_dir_access (char *path, int VERBOSE) {
+  
   struct stat filestat;
   uid_t uid;
@@ -43 +40 @@
 
   /* check permission to write to directory */
-  path = pathname (basefile);
   status = stat (path, &filestat);
   if (status == -1) {
@@ -62 +58 @@
     return (FALSE);
   }
+  return (TRUE);
+}
+
+/* check that file can be written to:
+   - dir exists
+   - dir permissions OK
+   - file permissions OK, 
+   - file backup permission OK (optional)
+*/
+int check_file_access (char *basefile, int BACKUP, int VERBOSE) {
+  
+  char *path, *filename;
+  struct stat filestat;
+  uid_t uid;
+  gid_t gid;
+  int status;
+
+  uid = getuid();
+  gid = getgid();
+
+  /* check permission to write to directory */
+  path = pathname (basefile);
+  status = check_dir_access (path, VERBOSE);
   free (path);
+  if (!status) return (FALSE);
   
   /* check permission to write to file */

trunk/Ohana/src/libohana/src/time.c

@@ -410 +410 @@
 double ohana_lst (double jd, double longitude) {
 
-  double t, ut, jdmid, jdint, jdfrac, sid_g, sid;
+  double t, ut, jdmid, jdint, jdfrac, sid_g;
   long sid_int;