[Frugalware-git] fw32: fw32.c: fix umount_all ismounted

[James Buren]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=bdd49c9c6048f1ef14c771624860bfca73cff9d4

commit bdd49c9c6048f1ef14c771624860bfca73cff9d4
Author: James Buren r...@frugalware.org
Date:   Thu Nov 3 02:39:32 2011 -0500

fw32.c: fix umount_all  ismounted

diff --git a/fw32.c b/fw32.c
index 75dcea3..e087316 100644
--- a/fw32.c
+++ b/fw32.c
@@ -170,7 +170,7 @@ ismounted(const char *path)

*e = 0;

-if(strcmp(s,path))
+if(!strcmp(s,path))
{
found = true;

@@ -268,7 +268,7 @@ umount_all(void)

*e = 0;

-if(strncmp(s,FW32_ROOT,strlen(FW32_ROOT)))
+if(!strncmp(s,FW32_ROOT,strlen(FW32_ROOT)))
umount_directory(s);
}

@@ -327,7 +327,7 @@ extern int
main(int argc,char **argv)
{
personality(PER_LINUX32);
-  fw32_create();
+

return EXIT_SUCCESS;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] fw32: fw32.c: fix umount_all

[James Buren]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fw32.git;a=commitdiff;h=3a417c72216ac713c5c61552583482d8db274b57

commit 3a417c72216ac713c5c61552583482d8db274b57
Author: James Buren r...@frugalware.org
Date:   Thu Nov 3 03:19:04 2011 -0500

fw32.c: fix umount_all

diff --git a/fw32.c b/fw32.c
index 8e83c59..65115be 100644
--- a/fw32.c
+++ b/fw32.c
@@ -239,40 +239,26 @@ mount_all(void)
{
const char **p;

-  for( p = FW32_DIRS ; *p ; ++p )
-mount_directory(*p);
+  p = FW32_DIRS;
+
+  while(*p)
+mount_directory(*p++);
}

static void
umount_all(void)
{
-  FILE *f;
-  char line[LINE_MAX], *s, *e;
-
-  f = fopen(/proc/mounts,rb);
+  const char **p;
+  char path[PATH_MAX];

-  if(!f)
-error(Cannot open /proc/mounts for reading.\n);
+  p = FW32_DIRS;

-  while(fgets(line,sizeof line,f))
+  while(*p)
{
-s = strchr(line,' ');
-
-if(!s)
-  continue;
-
-e = strchr(++s,' ');
-
-if(!e)
-  continue;
-
-*e = 0;
+snprintf(path,sizeof path,%s%s,FW32_ROOT,*p++);

-if(!strncmp(s,FW32_ROOT,strlen(FW32_ROOT)))
-  umount_directory(s);
+umount_directory(path);
}
-
-  fclose(f);
}

static void
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git