Index: chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.cc |
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc b/chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.cc |
similarity index 98% |
rename from ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc |
rename to chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.cc |
index 1339ebc8b3ddb91cadb600ebec0d1e497a1911cc..0382e17ef06666f30dc9880a09be462a1c42283d 100644 |
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.cc |
+++ b/chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.cc |
@@ -112,9 +112,9 @@ void TestManifestContents() { |
sb.DiscardOutput(); |
sb.Printf("File Contents:\n"); |
- FILE *iob = fdopen(desc, "r"); |
char buffer[4096]; |
- while (fgets(buffer, sizeof buffer, iob) != NULL) { |
+ int len; |
+ while ((len = read(desc, buffer, sizeof buffer - 1)) > 0) { |
// NB: fgets does not discard the newline nor any carriage return |
// character before that. |
// |
@@ -143,9 +143,10 @@ void TestManifestContents() { |
buffer[len-2] = '\n'; |
buffer[len-1] = '\0'; |
} |
+ // Null terminate. |
+ buffer[len] = 0; |
sb.Printf("%s", buffer); |
} |
- fclose(iob); // closed desc |
sb.Printf("\n"); |
sb.Printf("Opening non-existent file:\n"); |