ecrustified

SVN revision: 59416

diff --git a/src/bin/e_sys_main.c b/src/bin/e_sys_main.c
index 3291244..152523f 100644 (file)
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@@ -15,16 +15,25 @@
 #include <Eina.h>
 
 /* local subsystem functions */
-static int auth_action_ok(char *a, uid_t uid, gid_t gid, gid_t *gl, int gn, gid_t egid);
-static int auth_etc_enlightenment_sysactions(char *a, char *u, char **g);
-static char *get_word(char *s, char *d);
+static int auth_action_ok(char *a,
+                          uid_t uid,
+                          gid_t gid,
+                          gid_t *gl,
+                          int gn,
+                          gid_t egid);
+static int auth_etc_enlightenment_sysactions(char *a,
+                                             char *u,
+                                             char **g);
+static char *get_word(char *s,
+                      char *d);
 
 /* local subsystem globals */
 static Eina_Hash *actions = NULL;
 
 /* externally accessible functions */
 int
-main(int argc, char **argv)
+main(int argc,
+     char **argv)
 {
    int i, gn;
    int test = 0;
@@ -34,29 +43,29 @@ main(int argc, char **argv)
 
    for (i = 1; i < argc; i++)
      {
-       if ((!strcmp(argv[i], "-h")) ||
-           (!strcmp(argv[i], "-help")) ||
-           (!strcmp(argv[i], "--help")))
-         {
-            printf(
-                   "This is an internal tool for Enlightenment.\n"
-                   "do not use it.\n"
-                   );
-            exit(0);
-         }
+        if ((!strcmp(argv[i], "-h")) ||
+            (!strcmp(argv[i], "-help")) ||
+            (!strcmp(argv[i], "--help")))
+          {
+             printf(
+               "This is an internal tool for Enlightenment.\n"
+               "do not use it.\n"
+               );
+             exit(0);
+          }
      }
    if (argc == 3)
      {
-       if (!strcmp(argv[1], "-t")) test = 1;
-       action = argv[2];
+        if (!strcmp(argv[1], "-t")) test = 1;
+        action = argv[2];
      }
    else if (argc == 2)
      {
-       action = argv[1];
+        action = argv[1];
      }
    else
      {
-       exit(1);
+        exit(1);
      }
 
    uid = getuid();
@@ -65,45 +74,50 @@ main(int argc, char **argv)
    gn = getgroups(65536, gl);
    if (gn < 0)
      {
-       printf("ERROR: MEMBER OF MORE THAN 65536 GROUPS\n");
-       exit(3);
+        printf("ERROR: MEMBER OF MORE THAN 65536 GROUPS\n");
+        exit(3);
      }
    if (setuid(0) != 0)
      {
-       printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n");
-       exit(5);
+        printf("ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n");
+        exit(5);
      }
    if (setgid(0) != 0)
      {
-       printf("ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEDGES\n");
-       exit(7);
+        printf("ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEDGES\n");
+        exit(7);
      }
-   
+
    eina_init();
 
    if (!auth_action_ok(action, uid, gid, gl, gn, egid))
      {
-       printf("ERROR: ACTION NOT ALLOWED: %s\n", action);
-       exit(10);
+        printf("ERROR: ACTION NOT ALLOWED: %s\n", action);
+        exit(10);
      }
    /* we can add more levels of auth here */
-   
+
    cmd = eina_hash_find(actions, action);
    if (!cmd)
      {
-       printf("ERROR: UNDEFINED ACTION: %s\n", action);
-       exit(20);
+        printf("ERROR: UNDEFINED ACTION: %s\n", action);
+        exit(20);
      }
    if (!test) return system(cmd);
-   
+
    eina_shutdown();
-   
+
    return 0;
 }
 
 /* local subsystem functions */
 static int
-auth_action_ok(char *a, uid_t uid, gid_t gid, gid_t *gl, int gn, gid_t egid)
+auth_action_ok(char *a,
+               uid_t uid,
+               gid_t gid,
+               gid_t *gl,
+               int gn,
+               gid_t egid)
 {
    struct passwd *pw;
    struct group *gp;
@@ -119,22 +133,22 @@ auth_action_ok(char *a, uid_t uid, gid_t gid, gid_t *gl, int gn, gid_t egid)
    gp = getgrgid(gid);
    if (gp)
      {
-       grp[j] = gp->gr_name;
-       j++;
+        grp[j] = gp->gr_name;
+        j++;
      }
    for (i = 0; i < gn; i++)
      {
-       if (gl[i] != egid)
-         {
-            gp = getgrgid(gl[i]);
-            if (gp)
-              {
-                 g = alloca(strlen(gp->gr_name) + 1);
-                 strcpy(g, gp->gr_name);
-                 grp[j] = g;
-                 j++;
-              }
-         }
+        if (gl[i] != egid)
+          {
+             gp = getgrgid(gl[i]);
+             if (gp)
+               {
+                  g = alloca(strlen(gp->gr_name) + 1);
+                  strcpy(g, gp->gr_name);
+                  grp[j] = g;
+                  j++;
+               }
+          }
      }
    grp[j] = NULL;
    /* first stage - check:
@@ -142,13 +156,16 @@ auth_action_ok(char *a, uid_t uid, gid_t gid, gid_t *gl, int gn, gid_t egid)
     */
    ret = auth_etc_enlightenment_sysactions(a, usr, grp);
    if (ret == 1) return 1;
-   else if (ret == -1) return 0;
+   else if (ret == -1)
+     return 0;
    /* the DEFAULT - allow */
    return 1;
 }
 
 static int
-auth_etc_enlightenment_sysactions(char *a, char *u, char **g)
+auth_etc_enlightenment_sysactions(char *a,
+                                  char *u,
+                                  char **g)
 {
    FILE *f;
    char file[4096], buf[4096], id[4096], ugname[4096], perm[4096], act[4096];
@@ -156,124 +173,128 @@ auth_etc_enlightenment_sysactions(char *a, char *u, char **g)
    int len, line = 0, ok = 0;
    int allow = 0;
    int deny = 0;
-   
+
    snprintf(file, sizeof(file), "/etc/enlightenment/sysactions.conf");
    f = fopen(file, "r");
    if (!f)
      {
-       snprintf(file, sizeof(file), PACKAGE_SYSCONF_DIR"/enlightenment/sysactions.conf");
-       f = fopen(file, "r");
-       if (!f) return 0;
+        snprintf(file, sizeof(file), PACKAGE_SYSCONF_DIR "/enlightenment/sysactions.conf");
+        f = fopen(file, "r");
+        if (!f) return 0;
      }
    while (fgets(buf, sizeof(buf), f))
      {
-       line++;
-       len = strlen(buf);
-       if (len < 1) continue;
-       if (buf[len - 1] == '\n') buf[len - 1] = 0;
-       /* format:
-        * 
-        * # comment
-        * user:  username  [allow:|deny:] halt reboot ...
-        * group: groupname [allow:|deny:] suspend ...
-        */
-       if (buf[0] == '#') continue;
-       p = buf;
-       p = get_word(p, id);
-       p = get_word(p, ugname);
-       pp = p;
-       p = get_word(p, perm);
-       allow = 0;
-       deny = 0;
-       if (!strcmp(id, "user:"))
-         {
-            if (!fnmatch(ugname, u, 0))
-              {
-                 if (!strcmp(perm, "allow:")) allow = 1;
-                 else if (!strcmp(perm, "deny:")) deny = 1;
-                 else
-                   goto malformed;
-              }
-            else
-              continue;
-         }
-       else if (!strcmp(id, "group:"))
-         {
-            int matched;
-            
-            matched = 0;
-            for (gp = g; *gp; gp++)
-              {
-                 if (!fnmatch(ugname, *gp, 0))
-                   {
-                      matched = 1;
-                      if (!strcmp(perm, "allow:")) allow = 1;
-                      else if (!strcmp(perm, "deny:")) deny = 1;
-                      else
-                        goto malformed;
-                   }
-              }
-            if (!matched) continue;
-         }
-       else if (!strcmp(id, "action:"))
-         {
-            while ((*pp) && (isspace(*pp))) pp++;
-            s = eina_hash_find(actions, ugname);
-            if (s) eina_hash_del(actions, ugname, s);
-            if (!actions) actions = eina_hash_string_superfast_new(free);
-            eina_hash_add(actions, ugname, strdup(pp));
-            continue;
-         }
-       else if (id[0] == 0)
-         continue;
-       else
-         goto malformed;
-       
-       for (;;)
-         {
-            p = get_word(p, act);
-            if (act[0] == 0) break;
-            if (!fnmatch(act, a, 0))
-              {
-                 if (allow) ok = 1;
-                 else if (deny) ok = -1;
-                 goto done;
-              }
-         }
-       
-       continue;
-       malformed:
-       printf("WARNING: %s:%i\n"
-              "LINE: '%s'\n"
-              "MALFORMED LINE. SKIPPED.\n",
-              file, line, buf);
+        line++;
+        len = strlen(buf);
+        if (len < 1) continue;
+        if (buf[len - 1] == '\n') buf[len - 1] = 0;
+        /* format:
+         *
+         * # comment
+         * user:  username  [allow:|deny:] halt reboot ...
+         * group: groupname [allow:|deny:] suspend ...
+         */
+        if (buf[0] == '#') continue;
+        p = buf;
+        p = get_word(p, id);
+        p = get_word(p, ugname);
+        pp = p;
+        p = get_word(p, perm);
+        allow = 0;
+        deny = 0;
+        if (!strcmp(id, "user:"))
+          {
+             if (!fnmatch(ugname, u, 0))
+               {
+                  if (!strcmp(perm, "allow:")) allow = 1;
+                  else if (!strcmp(perm, "deny:"))
+                    deny = 1;
+                  else
+                    goto malformed;
+               }
+             else
+               continue;
+          }
+        else if (!strcmp(id, "group:"))
+          {
+             int matched;
+
+             matched = 0;
+             for (gp = g; *gp; gp++)
+               {
+                  if (!fnmatch(ugname, *gp, 0))
+                    {
+                       matched = 1;
+                       if (!strcmp(perm, "allow:")) allow = 1;
+                       else if (!strcmp(perm, "deny:"))
+                         deny = 1;
+                       else
+                         goto malformed;
+                    }
+               }
+             if (!matched) continue;
+          }
+        else if (!strcmp(id, "action:"))
+          {
+             while ((*pp) && (isspace(*pp))) pp++;
+             s = eina_hash_find(actions, ugname);
+             if (s) eina_hash_del(actions, ugname, s);
+             if (!actions) actions = eina_hash_string_superfast_new(free);
+             eina_hash_add(actions, ugname, strdup(pp));
+             continue;
+          }
+        else if (id[0] == 0)
+          continue;
+        else
+          goto malformed;
+
+        for (;; )
+          {
+             p = get_word(p, act);
+             if (act[0] == 0) break;
+             if (!fnmatch(act, a, 0))
+               {
+                  if (allow) ok = 1;
+                  else if (deny)
+                    ok = -1;
+                  goto done;
+               }
+          }
+
+        continue;
+malformed:
+        printf("WARNING: %s:%i\n"
+               "LINE: '%s'\n"
+               "MALFORMED LINE. SKIPPED.\n",
+               file, line, buf);
      }
-   done:
+done:
    fclose(f);
    return ok;
 }
 
 static char *
-get_word(char *s, char *d)
+get_word(char *s,
+         char *d)
 {
    char *p1, *p2;
-   
+
    p1 = s;
    p2 = d;
    while (*p1)
      {
-       if (p2 == d)
-         {
-            if (isspace(*p1))
-              {
-                 p1++;
-                 continue;
-              }
-         }
-       if (isspace(*p1)) break;
-       *p2 = *p1;
-       p1++;
-       p2++;
+        if (p2 == d)
+          {
+             if (isspace(*p1))
+               {
+                  p1++;
+                  continue;
+               }
+          }
+        if (isspace(*p1)) break;
+        *p2 = *p1;
+        p1++;
+        p2++;
      }
    *p2 = 0;
    return p1;