Merge pull request emscripten-core#8 from rstz/remove-bugfixes

Fix a bug in Unlink and add additional tests

Author: rstz

pthreadfs/examples/emscripten-tests/open_options.cpp

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/sysmacros.h>
+#include "pthreadfs.h"
+
+void create_file(const char *path, const char *buffer, int mode) {
+  int fd = open(path, O_CREAT | O_TRUNC | O_RDWR , mode);
+  assert(fd >= 0);
+
+  int err = write(fd, buffer, sizeof(char) * strlen(buffer));
+  assert(err ==  (sizeof(char) * strlen(buffer)));
+
+  close(fd);
+}
+
+void setup() {
+  // struct utimbuf t = {1200000000, 1200000000};
+
+  mkdir("pthreadfs/folder", 0777);
+  create_file("pthreadfs/folder/file", "abcdef", 0777);
+  //symlink("file", "folder/file-link");
+
+  //utime("folder/file", &t);
+  //utime("folder", &t);
+
+  puts("success");
+}
+
+void cleanup() {
+  unlink("pthreadfs/folder/file");
+  // unlink("folder/file-link");
+  rmdir("pthreadfs/folder");
+}
+
+void test() {
+  create_file("pthreadfs/folder/file", "blubbbbb", 0777);
+}
+
+int main() {
+  emscripten_init_pthreadfs();
+  setup();
+  test();
+  cleanup();
+  return EXIT_SUCCESS;
+}

pthreadfs/examples/emscripten-tests/remove.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/sysmacros.h>
+#include "pthreadfs.h"
+
+void create_file(const char *path, const char *buffer, int mode) {
+  int fd = open(path, O_CREAT | O_TRUNC | O_RDWR, mode);
+  assert(fd >= 0);
+
+  int err = write(fd, buffer, sizeof(char) * strlen(buffer));
+  assert(err ==  (sizeof(char) * strlen(buffer)));
+
+  close(fd);
+}
+
+void setup() {
+  // struct utimbuf t = {1200000000, 1200000000};
+
+  mkdir("pthreadfs/folder", 0777);
+  create_file("pthreadfs/folder/file", "abcdef", 0777);
+  //symlink("file", "folder/file-link");
+
+  //utime("folder/file", &t);
+  //utime("folder", &t);
+}
+
+void cleanup() {
+  unlink("pthreadfs/folder/file");
+  // unlink("folder/file-link");
+  rmdir("pthreadfs/folder");
+}
+
+void test() {
+  remove("pthreadfs/folder/file");
+  remove("pthreadfs/folder");
+
+
+  puts("success");
+}
+
+int main() {
+  emscripten_init_pthreadfs();
+  // atexit(cleanup);
+  //signal(SIGABRT, cleanup);
+  setup();
+  test();
+  cleanup();
+  return EXIT_SUCCESS;
+}

pthreadfs/examples/emscripten-tests/stat.cpp

@@ -0,0 +1,195 @@
+/*
+ * Copyright 2013 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/sysmacros.h>
+#include "pthreadfs.h"
+
+void create_file(const char *path, const char *buffer, int mode) {
+  int fd = open(path, O_CREAT | O_TRUNC | O_RDWR, mode);
+  assert(fd >= 0);
+
+  int err = write(fd, buffer, sizeof(char) * strlen(buffer));
+  assert(err ==  (sizeof(char) * strlen(buffer)));
+
+  close(fd);
+}
+
+void setup() {
+  // struct utimbuf t = {1200000000, 1200000000};
+
+  mkdir("pthreadfs/folder", 0777);
+  create_file("pthreadfs/folder/file", "abcdef", 0777);
+  //symlink("file", "folder/file-link");
+
+  //utime("folder/file", &t);
+  //utime("folder", &t);
+}
+
+void cleanup() {
+  rmdir("pthreadfs/folder/subdir");
+  unlink("pthreadfs/folder/file");
+  // unlink("folder/file-link");
+  rmdir("pthreadfs/folder");
+}
+
+void test() {
+  int err;
+  struct stat s;
+  // struct utimbuf t = {1200000000, 1200000000};
+
+  // non-existent
+  err = stat("pthreadfs/does_not_exist", &s);
+  assert(err == -1);
+  assert(errno == ENOENT);
+
+  // stat a folder
+  memset(&s, 0, sizeof(s));
+  err = stat("pthreadfs/folder", &s);
+  assert(!err);
+  assert(s.st_dev);
+  assert(s.st_ino);
+  assert(S_ISDIR(s.st_mode));
+  assert(s.st_nlink);
+  assert(s.st_rdev == 0);
+  assert(s.st_size);
+  // assert(s.st_atime == 1200000000);
+  // assert(s.st_mtime == 1200000000);
+  // assert(s.st_ctime);
+#ifdef __EMSCRIPTEN__
+  assert(s.st_blksize == 4096);
+  assert(s.st_blocks == 1);
+#endif
+
+  // stat a file
+  memset(&s, 0, sizeof(s));
+  err = stat("pthreadfs/folder/file", &s);
+  assert(!err);
+  assert(s.st_dev);
+  assert(s.st_ino);
+  assert(S_ISREG(s.st_mode));
+  assert(s.st_nlink);
+  assert(s.st_rdev == 0);
+  assert(s.st_size == 6);
+  // assert(s.st_atime == 1200000000);
+  // assert(s.st_mtime == 1200000000);
+  // assert(s.st_ctime);
+#ifdef __EMSCRIPTEN__
+  assert(s.st_blksize == 4096);
+  assert(s.st_blocks == 1);
+#endif
+
+  // fstat a file (should match file stat from above)
+  memset(&s, 0, sizeof(s));
+  err = fstat(open("pthreadfs/folder/file", O_RDONLY), &s);
+  assert(!err);
+  assert(s.st_dev);
+  assert(s.st_ino);
+  assert(S_ISREG(s.st_mode));
+  assert(s.st_nlink);
+  assert(s.st_rdev == 0);
+  assert(s.st_size == 6);
+  // assert(s.st_atime == 1200000000);
+  // assert(s.st_mtime == 1200000000);
+  // assert(s.st_ctime);
+#ifdef __EMSCRIPTEN__
+  assert(s.st_blksize == 4096);
+  assert(s.st_blocks == 1);
+#endif
+
+  // stat a device
+  memset(&s, 0, sizeof(s));
+  err = stat("/dev/null", &s);
+  assert(!err);
+  assert(s.st_dev);
+  assert(s.st_ino);
+  assert(S_ISCHR(s.st_mode));
+  assert(s.st_nlink);
+#ifndef __APPLE__
+  // mac uses makedev(3, 2) for /dev/null
+  assert(s.st_rdev == makedev(1, 3));
+#endif
+  assert(!s.st_size);
+  assert(s.st_atime);
+  assert(s.st_mtime);
+  assert(s.st_ctime);
+#ifdef __EMSCRIPTEN__
+  assert(s.st_blksize == 4096);
+  assert(s.st_blocks == 0);
+#endif
+
+  // stat a link (should match the file stat from above)
+//   memset(&s, 0, sizeof(s));
+//   err = stat("folder/file-link", &s);
+//   assert(!err);
+//   assert(s.st_dev);
+//   assert(s.st_ino);
+//   assert(S_ISREG(s.st_mode));
+//   assert(s.st_nlink);
+//   assert(s.st_rdev == 0);
+//   assert(s.st_size == 6);
+//   assert(s.st_atime == 1200000000);
+//   assert(s.st_mtime == 1200000000);
+//   assert(s.st_ctime);
+// #ifdef __EMSCRIPTEN__
+//   assert(s.st_blksize == 4096);
+//   assert(s.st_blocks == 1);
+// #endif
+
+  // lstat a link (should NOT match the file stat from above)
+//   memset(&s, 0, sizeof(s));
+//   err = lstat("folder/file-link", &s);
+//   assert(!err);
+//   assert(s.st_dev);
+//   assert(s.st_ino);
+//   assert(S_ISLNK(s.st_mode));
+//   assert(s.st_nlink);
+//   assert(s.st_rdev == 0);
+//   assert(s.st_size == 4);  // strlen("file")
+//   assert(s.st_atime != 1200000000);  // should NOT match the utime call we did for dir/file
+//   assert(s.st_mtime != 1200000000);
+//   assert(s.st_ctime);
+// #ifdef __EMSCRIPTEN__
+//   assert(s.st_blksize == 4096);
+//   assert(s.st_blocks == 1);
+// #endif
+
+  // create and unlink files inside a directory and check that mtime updates
+  mkdir("pthreadfs/folder/subdir", 0777);
+  // utime("pthreadfs/folder/subdir", &t);
+  create_file("pthreadfs/folder/subdir/file", "abcdef", 0777);
+  err = stat("pthreadfs/folder/subdir", &s);
+  // assert(s.st_mtime != 1200000000);
+  // utime("pthreadfs/folder/subdir", &t);
+  unlink("pthreadfs/folder/subdir/file");
+  err = stat("pthreadfs/folder/subdir", &s);
+  // assert(s.st_mtime != 1200000000);
+
+  puts("success");
+}
+
+int main() {
+  emscripten_init_pthreadfs();
+  // atexit(cleanup);
+  //signal(SIGABRT, cleanup);
+  setup();
+  test();
+  cleanup();
+  return EXIT_SUCCESS;
+}