| Index: chrome/test/data/nacl/manifest_file/pm_manifest_file_test.cc
|
| diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc b/chrome/test/data/nacl/manifest_file/pm_manifest_file_test.cc
|
| similarity index 99%
|
| rename from ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc
|
| rename to chrome/test/data/nacl/manifest_file/pm_manifest_file_test.cc
|
| index bfa26dd9597d2b51f7b65f5240a0035180045232..7cb3179864a1e3e3540685d5b620d7656ae1f0c4 100644
|
| --- a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_manifest_file_test.cc
|
| +++ b/chrome/test/data/nacl/manifest_file/pm_manifest_file_test.cc
|
| @@ -550,9 +550,9 @@ void Worker::ManifestOpenTest(nacl::StringBuffer *sb) {
|
| 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.
|
| //
|
| @@ -576,14 +576,14 @@ void Worker::ManifestOpenTest(nacl::StringBuffer *sb) {
|
| //
|
| // To defend against such nonsense, we weaken the test slighty,
|
| // and just strip the CR if it is present.
|
| - int len = strlen(buffer);
|
| if (len >= 2 && buffer[len-1] == '\n' && buffer[len-2] == '\r') {
|
| buffer[len-2] = '\n';
|
| buffer[len-1] = '\0';
|
| }
|
| + // Null terminate.
|
| + buffer[len] = 0;
|
| sb->Printf("%s", buffer);
|
| }
|
| - fclose(iob); // closed desc
|
| NaClSrpcDtor(&manifest_channel);
|
| return;
|
| }
|
|
|