Changeset c702d2 in git

Timestamp:

Apr 28, 1998, 3:39:18 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

fd39b4bc41d4f0180e03b38d9a8b48b70ae5ec87

Parents:

986f2e14f22a5ca79aefc978f7420a7c9aa1147c

Message:

* hannes: minor fixes


git-svn-id: file:///usr/local/Singular/svn/trunk@1522 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/find_exec.c (modified) (5 diffs)

Singular/find_exec.c

@@ -36 +36 @@
 
 
-/* Do not return copies of sth, but simply the strings 
+/* Do not return copies of sth, but simply the strings
    -- we make copies later */
 #define copy_of(string) mstrdup(string)
@@ -42 +42 @@
 /* ABSOLUTE_FILENAME_P (fname): True if fname is an absolute filename */
 #ifdef atarist
-#define ABSOLUTE_FILENAME_P(fname)      ((fname[0] == '/') || \
-        (fname[0] && (fname[1] == ':')))
+#define ABSOLUTE_FILENAME_P(fname)        ((fname[0] == '/') || \
+        (fname[0] && (fname[1] == ':')))
 #else
-#define ABSOLUTE_FILENAME_P(fname)      (fname[0] == '/')
+#define ABSOLUTE_FILENAME_P(fname)        (fname[0] == '/')
 #endif /* atarist */
 
@@ -61 +61 @@
       /* If we can execute the named file, and it is normal, then return it. */
       if (! access (name, X_OK)) {
-        struct stat stat_temp;
+        struct stat stat_temp;
 
-        if (stat (name, &stat_temp))
-          return 0;
+        if (stat (name, &stat_temp))
+          return 0;
 
 #ifndef STAT_MACROS_BROKEN
-        if (! S_ISREG(stat_temp.st_mode))
-          return 0;
+        if (! S_ISREG(stat_temp.st_mode))
+          return 0;
 #endif
-        return copy_of (name);
+        return copy_of (name);
       }
     }
@@ -97 +97 @@
       /* Perform tilde-expansion. Stolen from GNU readline/tilde.c. */
       if (p[0] == '~') {
-        if (! p[1] || p[1] == '/') {
-          /* Prepend $HOME to the rest of the string. */
-          char *temp_home = (char *) getenv ("HOME");
+        if (! p[1] || p[1] == '/') {
+          /* Prepend $HOME to the rest of the string. */
+          char *temp_home = (char *) getenv ("HOME");
 
-          /* If there is no HOME variable, look up the directory in the
-             password database. */
-          if (! temp_home) {
-            struct passwd *entry;
+          /* If there is no HOME variable, look up the directory in the
+             password database. */
+          if (! temp_home) {
+            struct passwd *entry;
 
-            entry = getpwuid (getuid ());
-            if (entry)
-              temp_home = entry->pw_dir;
-          }
+            entry = getpwuid (getuid ());
+            if (entry)
+              temp_home = entry->pw_dir;
+          }
 
-          strcpy (tbuf, temp_home);
-          next = tbuf + strlen (tbuf);
-          p ++;
-        }
-        else {
-          char username[MAXPATHLEN];
-          struct passwd *user_entry;
-          int i;
+          strcpy (tbuf, temp_home);
+          next = tbuf + strlen (tbuf);
+          p ++;
+        }
+        else {
+          char username[MAXPATHLEN];
+          struct passwd *user_entry;
+          int i;
 
-          p ++;                 /* Skip the tilde. */
-          for (i = 0; *p && *p != '/' && *p != ':'; i++)
-            username[i] = *p ++;
-          username[i] = '\0';
+          p ++;                        /* Skip the tilde. */
+          for (i = 0; *p && *p != '/' && *p != ':'; i++)
+            username[i] = *p ++;
+          username[i] = '\0';
 
-          user_entry = getpwnam (username);
-          if (user_entry) {
-            strcpy (tbuf, user_entry->pw_dir);
-            next = tbuf + strlen (tbuf);
-          }
-        }
+          user_entry = getpwnam (username);
+          if (user_entry) {
+            strcpy (tbuf, user_entry->pw_dir);
+            next = tbuf + strlen (tbuf);
+          }
+        }
 
-        endpwent ();
+        endpwent ();
       }
 
       /* Copy directory name into [tbuf]. */
       while (*p && *p != ':')
-        *next ++ = *p ++;
+        *next ++ = *p ++;
       *next = '\0';
       if (*p != '\0')
-        p ++;
+        p ++;
 
       if (tbuf[0] == '.' && tbuf[1] == '\0') {
 #ifdef HAVE_GETCWD
-        getcwd (tbuf, MAXPATHLEN);
+        getcwd (tbuf, MAXPATHLEN);
 #else
 # ifdef HAVE_GETWD
-        getwd (tbuf);
+        getwd (tbuf);
 # endif
 #endif
@@ -157 +157 @@
       /* If we can execute the named file, and it is normal, then return it. */
       if (! access (tbuf, X_OK)) {
-        struct stat stat_temp;
+        struct stat stat_temp;
 
-        if (stat (tbuf, &stat_temp))
-          continue;
+        if (stat (tbuf, &stat_temp))
+          continue;
 
 #ifndef STAT_MACROS_BROKEN
-        if (! S_ISREG(stat_temp.st_mode))
-          continue;
+        if (! S_ISREG(stat_temp.st_mode))
+          continue;
 #endif
-        return copy_of (tbuf);
+        return copy_of (tbuf);
       }
     }