Review changes

src/linux/system-linux.c

@@ -19,7 +19,7 @@ static gchar mntent_buf [PATH_MAX * 4] = {0};
 static void frida_collect_process_info (guint pid, FridaEnumerateProcessesOperation * op);
 static gboolean frida_is_mount_noexec (struct mntent * mntent);
 static gboolean frida_is_directory_noexec (const gchar * directory);
-static gchar * get_application_directory (void);
+static gchar * frida_get_application_directory (void);
 static gboolean frida_add_process_metadata (GHashTable * parameters, const gchar * proc_entry_name);
 static GDateTime * frida_query_boot_time (void);
 static GVariant * frida_uid_to_name (uid_t uid);
@@ -185,21 +185,17 @@ frida_temporary_directory_get_system_tmp (void)
    * to validate an ordered list of potential locations.
    */
   if (frida_is_directory_noexec (tmp_dir))
-  {
-    return get_application_directory ();
-  }
+    return frida_get_application_directory ();
   else
-  {
     return g_strdup (tmp_dir);
-  }
 }
 
 static gboolean
 frida_is_directory_noexec (const gchar * directory)
 {
   struct stat directory_stat, current_stat;
-  FILE *fp = NULL;
-  struct mntent mntent, *current;
+  FILE * fp = NULL;
+  struct mntent mntent, * current;
 
   /*
    * Since the mounting of the temporary filesystem as `noexec` is not that
@@ -214,37 +210,37 @@ frida_is_directory_noexec (const gchar * directory)
    * busybox. It finds the mounted filesystem on which a given directory resides
    * and checks the mount options for `noexec`.
    */
-  if (stat(directory, &directory_stat) != 0)
+  if (stat (directory, &directory_stat) != 0)
     goto beach;
 
-  if (!S_ISDIR(directory_stat.st_mode))
+  if (!S_ISDIR (directory_stat.st_mode))
     goto beach;
 
   fp = setmntent ("/proc/mounts", "r");
   if (fp == NULL)
     goto beach;
 
   for (
-    current = getmntent_r(fp, &mntent, mntent_buf, sizeof (mntent_buf));
+    current = getmntent_r (fp, &mntent, mntent_buf, sizeof (mntent_buf));
     current != NULL;
-    current = getmntent_r(fp, &mntent, mntent_buf, sizeof (mntent_buf)))
+    current = getmntent_r (fp, &mntent, mntent_buf, sizeof (mntent_buf)))
   {
     /*
      * In Linux 2.6 rootfs mount always exists, and it makes sense to always
      * ignore it.
      */
-    if (g_strcmp0(current->mnt_fsname, "rootfs") == 0)
+    if (g_strcmp0 (current->mnt_fsname, "rootfs") == 0)
       continue;
 
     /* If the directory name matches the mountpoint */
-    if (g_strcmp0(directory, current->mnt_dir) == 0)
+    if (g_strcmp0 (directory, current->mnt_dir) == 0)
     {
       noexec = frida_is_mount_noexec (current);
       break;
     }
 
     /* If the directory name matches mounted the device name */
-    if (g_strcmp0(directory, current->mnt_fsname) == 0)
+    if (g_strcmp0 (directory, current->mnt_fsname) == 0)
     {
       noexec = frida_is_mount_noexec (current);
       break;
@@ -254,7 +250,7 @@ frida_is_directory_noexec (const gchar * directory)
     if (current->mnt_fsname[0] == '/')
     {
       /* Match the directory and device dev_t */
-      if (stat(current->mnt_fsname, &current_stat) == 0)
+      if (stat (current->mnt_fsname, &current_stat) == 0)
       {
         if (current_stat.st_rdev == directory_stat.st_dev)
         {
@@ -265,7 +261,7 @@ frida_is_directory_noexec (const gchar * directory)
     }
 
     /* Match the directory and mount point's dev_t */
-    if (stat(current->mnt_dir, &current_stat) == 0)
+    if (stat (current->mnt_dir, &current_stat) == 0)
     {
       if (current_stat.st_dev == directory_stat.st_dev)
       {
@@ -292,10 +288,10 @@ frida_is_mount_noexec (struct mntent * mntent)
 }
 
 static gchar *
-get_application_directory (void)
+frida_get_application_directory (void)
 {
-  gchar* exe_path = NULL;
-  gchar* exe_dir = NULL;
+  gchar * exe_path = NULL;
+  gchar * exe_dir = NULL;
 
   exe_path = g_file_read_link ("/proc/self/exe", NULL);
   if (exe_path == NULL)
@@ -304,8 +300,7 @@ get_application_directory (void)
   exe_dir = g_path_get_dirname (exe_path);
 
 beach:
-  if (exe_path != NULL)
-    g_free (exe_path);
+  g_free (exe_path);
 
   return exe_dir;
 }