Staging
v0.5.1
https://github.com/python/cpython
Revision 934f4e1f398bb0dd712f40ecf7957327bdae33f8 authored by Ronald Oussoren on 22 June 2010, 09:18:28 UTC, committed by Ronald Oussoren on 22 June 2010, 09:18:28 UTC
* Don't import 'ic' in webbrowser, that module is no longer used
* Remove 'MacOS' from the list of modules that should emit a Py3kWarning on import.
  This is needed because one of the earlier tests triggers and import of this
  extension, and that causes a failure in test_py3kwarn (running test_py3kwarn
  separately worked fine)

With these changes 'make tests' no longer says that test_py3kwarn fails.
1 parent 4f61259
Raw File
Tip revision: 934f4e1f398bb0dd712f40ecf7957327bdae33f8 authored by Ronald Oussoren on 22 June 2010, 09:18:28 UTC
Fix for issue8446:
Tip revision: 934f4e1
dup2.c
/*
 * Public domain dup2() lookalike
 * by Curtis Jackson @ AT&T Technologies, Burlington, NC
 * electronic address:  burl!rcj
 *
 * dup2 performs the following functions:
 *
 * Check to make sure that fd1 is a valid open file descriptor.
 * Check to see if fd2 is already open; if so, close it.
 * Duplicate fd1 onto fd2; checking to make sure fd2 is a valid fd.
 * Return fd2 if all went well; return BADEXIT otherwise.
 */

#include <fcntl.h>

#define BADEXIT -1

int
dup2(int fd1, int fd2)
{
	if (fd1 != fd2) {
		if (fcntl(fd1, F_GETFL) < 0)
			return BADEXIT;
		if (fcntl(fd2, F_GETFL) >= 0)
			close(fd2);
		if (fcntl(fd1, F_DUPFD, fd2) < 0)
			return BADEXIT;
	}
	return fd2;
}
back to top