Staging
v0.5.1
https://github.com/python/cpython
Revision be325e6132c9198f7b8e9c7da2dd0017a33212cc authored by Miss Islington (bot) on 30 May 2018, 11:56:19 UTC, committed by Petr Viktorin on 30 May 2018, 11:56:19 UTC
* Add a space to ensurepip's --altinstall option
* Add periods to the arguments of ensurepip that didn't have it

This makes --help for all optional arguments consistent and also makes it
consistent with pip --help.
(cherry picked from commit e9537ad6a128924dd610bea2268065500c174181)

Co-authored-by: Wieland Hoffmann <mineo@users.noreply.github.com>
1 parent 3b263e6
Raw File
Tip revision: be325e6132c9198f7b8e9c7da2dd0017a33212cc authored by Miss Islington (bot) on 30 May 2018, 11:56:19 UTC
Improve ensurepip's --help (GH-4686) (GH-7239)
Tip revision: be325e6
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>
#include <unistd.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