Paths

Table of Contentst

-
Mk/
5/5
bsd.python.mk
-
devel/py-setuptools/
-
py-setuptools/
5/5
Makefile
5/5
distinfo
-
files/
5/5
patch-setuptools__command__install_egg_info.py
-
patch-setuptools_command_install_egg_info.py
-
lang/python27/
-
python27/
-
Makefile
-
distinfo
-
files/
-
patch-CVE-2014-1912
-
patch-Doc-library-fcntl.rst
-
patch-Doc__library__fcntl.rst
-
patch-Modules-fcntlmodule.c
-
patch-Modules__fcntlmodule.c
-
patch-issue20374
-
patch-setup.py
-
pkg-message.in
-
pkg-plist

py-setuptools to 5.4.1
ClosedPublic
Actions

Authored by koobs on Jul 5 2014, 1:00 PM.

Details

Reviewers

mva
xmj
antoine
bapt
wg
lwhsu

Group Reviewers

portmgr

Summary

lang/python27:

Update to 2.7.8, update pkg-plist accordingly
OPTIONS: Reorder and sort alphabetically
OPTIONS: Make POSIX SEM(aphores) a default (Hi binary package users!)
OPTIONS: Add better descriptions for UCS2 and UCS4
Use OPTIONS helpers
Remove patch-CVE-2014-1912: upstream
Remove patch-issue20374: upstream
Rename patch-Doclibraryfcntl.rst: underscore convention
Rename patch-Modules__fcntlmodule.c: underscore convention
Modify patch-setup.py: revert ncurses overrides, add partial backport for ossaudio checks
Remove pkg-message warning for POSIX Semaphores. They are now in GENERIC for 8.x 9.x, 10.x and tested well upstream
Tweak pkg-message
Remove platformX bits from Makefile/pkg-plist
Add regression-test target

devel/py-setuptools

Update to 5.3
Rename patch-setuptools_command_install_egg_info.py (conventions)
Whitespace alignment

Test Plan

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191405
lang/python27: regression-test passes on 9-STABLE
devel/py-setuptools: Ran 135 tests in 2.274s FAILED (failures=1, skipped=1) (Known Failure)
Poudriere logs: https:// koobs dot io/poudriere/bulk/latest-per-pkg/python27/2.7.8/
Needs exp-run

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

koobs updated this revision to Diff 611.Jul 5 2014, 1:00 PM

koobs retitled this revision from to Update python27 to 2.7.8, setuptools to 5.3.

koobs updated this object.

koobs edited the test plan for this revision. (Show Details)

koobs added reviewers: mva, wg, xmj, lwhsu.

Herald added a reviewer: portmgr. · View Herald TranscriptJul 5 2014, 1:00 PM

koobs edited the test plan for this revision. (Show Details)Jul 5 2014, 1:06 PM

koobs edited edge metadata.

koobs edited the test plan for this revision. (Show Details)

koobs added a reviewer: antoine.

koobs retitled this revision from Update python27 to 2.7.8, setuptools to 5.3 to Update lang/python27 to 2.7.8, devel/py-setuptools to 5.3.Jul 5 2014, 1:09 PM

Hi,

SEM_CONFIGURE_ON= ac_cv_posix_semaphores_enabled=yes
SEM_CONFIGURE_OFF= ac_cv_posix_semaphores_enabled=no

Shouldnt this be SEM_CONFIGURE_ENV_ON

In D364#8, @wg wrote:

Hi,

SEM_CONFIGURE_ON= ac_cv_posix_semaphores_enabled=yes
SEM_CONFIGURE_OFF= ac_cv_posix_semaphores_enabled=no

Shouldnt this be SEM_CONFIGURE_ENV_ON

?

Work both in the ENV and as an argument. (Also, we don't have *_CONFIGURE_ENV_*)

In D364#9, @mat wrote:

In D364#8, @wg wrote:

Hi,

SEM_CONFIGURE_ON= ac_cv_posix_semaphores_enabled=yes
SEM_CONFIGURE_OFF= ac_cv_posix_semaphores_enabled=no

Shouldnt this be SEM_CONFIGURE_ENV_ON

?

Work both in the ENV and as an argument. (Also, we don't have *_CONFIGURE_ENV_*)

Yes, we do, see /usr/ports/Mk/bsd.options.mk _OPTIONS_FLAGS.

There are places using CONFIGURE_ENV_ON and other places using CONFIGURE_ON, just trying to understand why the discrepancy.

In D364#11, @wg wrote:

In D364#9, @mat wrote:

In D364#8, @wg wrote:

Hi,

SEM_CONFIGURE_ON= ac_cv_posix_semaphores_enabled=yes
SEM_CONFIGURE_OFF= ac_cv_posix_semaphores_enabled=no

Shouldnt this be SEM_CONFIGURE_ENV_ON

?

Work both in the ENV and as an argument. (Also, we don't have *_CONFIGURE_ENV_*)

Yes, we do, see /usr/ports/Mk/bsd.options.mk _OPTIONS_FLAGS.

There are places using CONFIGURE_ENV_ON and other places using CONFIGURE_ON, just trying to understand why the discrepancy.

Allow me to correct myself, there is a place using CONFIGURE_ENV_OFF not ON.

Reading the code more carefully we have OPT_CONFIGURE_ENV= and OPT_CONFIGURE_ENV_OFF=, but no OPT_CONFIGURE_ENV_ON= (which was what I proposed and seems it should actually be OPT_CONFIGURE_ENV=).

Cheers,

koobs edited the test plan for this revision. (Show Details)Jul 5 2014, 2:21 PM

koobs edited edge metadata.

Noportdata is still in use so the hook will prevent you from committing that, btw the build procedure is still weird, can we with that change include the clean up needed, like it was done with python34

This revision now requires changes to proceed.Jul 5 2014, 2:33 PM

There is still a @${CAT} ${PKGMESSAGE} as well.

koobs retitled this revision from Update lang/python27 to 2.7.8, devel/py-setuptools to 5.3 to Update lang/python27 to 2.7.8, devel/py-setuptools to 5.4.1.Jul 8 2014, 6:31 AM

koobs edited edge metadata.

Update: Options helpers, NOPORTDATA, PKGMESSAGE

Modify SEM_CONFIGURE_OFF -> SEM_CONFIGURE_ENV_OFF (wg@)
Remove NOPORTDATA conditional (bapt@)
Remove ${CAT} ${PKGMESSAGE} (wg@)

Blocked on review/accept of updated changes.

mva requested changes to this revision.Jul 10 2014, 6:34 AM

mva edited edge metadata.

mva added inline comments.

lang/python27/Makefile
60	This should be Enable UCS4 Unicode Strings
62–63	FPECTL_CONFIGURE_WITH= fpectl
78	UCS2_CONFIGURE_ENABLE= unicode=ucs2 (not sure, if that works, but it should)
79	UCS4_CONFIGURE_ENABLE= unicode=ucs4 (not sure, if that works, but it should)

This revision now requires changes to proceed.Jul 10 2014, 6:34 AM

koobs added inline comments.Jul 10 2014, 6:54 AM

lang/python27/Makefile
60	Yep, good find
62–63	I tried to be super explicit, since I cant see a --without-fpectl case in configure, only a --with-fpectl=no case: # Check for --with-fpectl { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-fpectl" >&5 $as_echo_n "checking for --with-fpectl... " >&6; } # Check whether --with-fpectl was given. if test "${with_fpectl+set}" = set; then : withval=$with_fpectl; if test "$withval" != no then I know most configure's are supposed to support enable/disable/with/without/=yes/=no transparently for all if not most cases, but I've also see very fail configures that only support VERY specific syntaxen
78	As above, opt_CONFIGURE_ENABLE is nicely declarative, but has the downside of adding an implicit --disable-${content} value when the option is disabled: # ${opt}_CONFIGURE_ENABLE Will add to CONFIGURE_ARGS: # Option enabled --enable-${content} # Option disabled --disable-${content}
79	As above, opt_CONFIGURE_ENABLE is nicely declarative, but has the downside of adding an implicit --disable-${content} value when the option is disabled: # ${opt}_CONFIGURE_ENABLE Will add to CONFIGURE_ARGS: # Option enabled --enable-${content} # Option disabled --disable-${content}

mat added inline comments.Jul 10 2014, 8:37 AM

lang/python27/Makefile
78	nope, it only works with CONFIGURE_WITH, because you can have say --enable-codec=mp3 --disable-codec=x264 or something (at least, that's what I was told when I asked why not add it to _CONFIGURE_ENABLE too.)

Fix typo in UCS4 option description (mva@)

mat added inline comments.Jul 10 2014, 8:59 AM

lang/python27/Makefile
78	see http://www.freebsd.org/doc/en/books/porters-handbook/makefile-options.html#options-configure_enable

mat added inline comments.Jul 10 2014, 9:04 AM

lang/python27/Makefile
78	Also, in that case, it should NOT be _CONFIGURE_ENABLE, but only _CONFIGURE_ON.

mva added inline comments.Jul 10 2014, 9:52 AM

lang/python27/Makefile
62–63	Okay, agreed - we should add a comment then, so that others do not "clean it up" and possibly break behaviour. #Using _ON instead of _WITH here, since --without-fpectl might not be explicitly handled FPECTL_CONFIGURE_ON= --with-fpectl

In D364#34, @mva wrote:
Okay, agreed - we should add a comment then, so that others do not "clean it up" and possibly break behaviour.
#Using _ON instead of _WITH here, since --without-fpectl might not be explicitly handled
FPECTL_CONFIGURE_ON=  --with-fpectl

Perhaps those notes are more useful in port.options.mk

In D364#35, @koobs wrote:
In D364#34, @mva wrote:
Okay, agreed - we should add a comment then, so that others do not "clean it up" and possibly break behaviour.
#Using _ON instead of _WITH here, since --without-fpectl might not be explicitly handled
FPECTL_CONFIGURE_ON=  --with-fpectl
Perhaps those notes are more useful in port.options.mk

No. Usually the autotools magic for with/without works just fine. If you noticed a different behaviour, that would be most likely specific for the script in question (until proven otherwise ;-).

I carefully closed my eyes on the static/share thing (which I still think should be cleaned out in the same time because it is blocking my work on cross building :))

I still have a couple of others comments
Given pkg-message does not have anymore any pattern to be changes by SUB_LIST it is useless to still name it .in leave it in files, that makes run a complicated sed for nothing.

Others comments are inlined

lang/python27/Makefile
81	I see nothing that requires .bsd.port.pre.mk why not just bsd.port.options.mk?
177	MSEM_EXTRA_PATCHES= ${FILESDIR}/extra-patch-setup.py Should do the above in a nicer way and with better control
205	Useless use of cat here :) ${AWK} ... ${PLIST_TEMPLATE} would be simpler :)
246	let's in case earlier pre.mk has been replaced by options.mk replace that by bsd.port.mk

And now it messes up some builds for people using the PTH option. It seems to be misleading for people and should be removed. See

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=189844
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191744

for more details.

I'd like to decouple any PTH changes from this commit, as it has already been delayed and it clearly needs further investigation independent from the 2.7.8 update.

Also, the NOPORTDATA change has now been committed by @sbz in https://svnweb.freebsd.org/ports?view=revision&revision=361574

lang/python27/Makefile
81	Ack'd
177	The SEM option will be removed along with PTH (and potentially others) in subsequent changes, with associated cleanups/upstreaming that will be possible. Will not include any SEM options/mechanism modifications in this 2.7.8 update
205	Not confident enough to change this given I don't know what it does, or achieves. Can you provide the alternative code?
246	Ack'd

pkg-message, SUB_FILES and bsd.port.options.mk

files/pkg-message no longer needs substitutions, remove .in suffix and SUB_FILES (bapt@)

Replace bsd.port.{pre,post}.mk with port.options.mk (unecessary) (bapt@)

mva accepted this revision.Jul 13 2014, 10:51 AM

mva edited edge metadata.

bapt accepted this revision.Jul 13 2014, 11:28 AM

bapt edited edge metadata.

This revision is now accepted and ready to land.Jul 13 2014, 11:28 AM

koobs closed this revision.Jul 17 2014, 3:12 AM

Revision Contents
Changeset List

Path

Size

Mk/

bsd.python.mk

4 lines

devel/

py-setuptools/

Makefile

4 lines

distinfo

4 lines

files/

patch-setuptools__command__install_egg_info.py

15 lines

patch-setuptools_command_install_egg_info.py

lang/

python27/

Makefile

91 lines

distinfo

4 lines

files/

patch-CVE-2014-1912

patch-Doc-library-fcntl.rst

patch-Doc__library__fcntl.rst

10 lines

patch-Modules-fcntlmodule.c

patch-Modules__fcntlmodule.c

53 lines

66 lines

17 lines

72 lines

Diff 661

View Options

Mk/bsd.python.mk

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines

static void add_compunit(enum e_cut, char *);		static void add_compunit(enum e_cut, char *);
static void add_file(char *);		static void add_file(char *);
static void usage(void);		static void usage(void);

int		int
main(int argc, char *argv[])		main(int argc, char *argv[])
{		{
int c, fflag;		int c, fflag, fflagstdin;
char *temp_arg;		char *temp_arg;

(void) setlocale(LC_ALL, "");		(void) setlocale(LC_ALL, "");

fflag = 0;		fflag = 0;
		fflagstdin = 0;
inplace = NULL;		inplace = NULL;

while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)		while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) {		switch (c) {
case 'r': /* Gnu sed compat */		case 'r': /* Gnu sed compat */
case 'E':		case 'E':
rflags = REG_EXTENDED;		rflags = REG_EXTENDED;
break;		break;
Show All 9 Lines	case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)		if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc");		err(1, "malloc");
strcpy(temp_arg, optarg);		strcpy(temp_arg, optarg);
strcat(temp_arg, "\n");		strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg);		add_compunit(CU_STRING, temp_arg);
break;		break;
case 'f':		case 'f':
fflag = 1;		fflag = 1;
		if (strcmp(optarg, "-") == 0)
		fflagstdin = 1;
add_compunit(CU_FILE, optarg);		add_compunit(CU_FILE, optarg);
break;		break;
case 'i':		case 'i':
inplace = optarg;		inplace = optarg;
ispan = 0; /* don't span across input files */		ispan = 0; /* don't span across input files */
break;		break;
case 'l':		case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)		if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Lines	main(int argc, char *argv[])
}		}

compile();		compile();

/* Continue with first and start second usage */		/* Continue with first and start second usage */
if (*argv)		if (*argv)
for (; *argv; argv++)		for (; *argv; argv++)
add_file(*argv);		add_file(*argv);
		else if (fflagstdin)
		0mpAuthorUnsubmitted Done Inline Actions There has to be at least one input file specified. 0mp: There has to be at least one input file specified.
		exit(rval);
else		else
add_file(NULL);		add_file(NULL);
process();		process();
cfclose(prog, NULL);		cfclose(prog, NULL);
if (fclose(stdout))		if (fclose(stdout))
err(1, "stdout");		err(1, "stdout");
exit(rval);		exit(rval);
}		}
Show All 27 Lines	case ST_EOF:
if (script == NULL) {		if (script == NULL) {
if (more != NULL)		if (more != NULL)
*more = 0;		*more = 0;
return (NULL);		return (NULL);
}		}
linenum = 0;		linenum = 0;
switch (script->type) {		switch (script->type) {
case CU_FILE:		case CU_FILE:
		if (strcmp(script->s, "-") == 0) {
		if ((f = fdopen(0, "r")) == NULL)
		0mpAuthorUnsubmitted Done Inline Actions I am not sure if it makes any difference if I try to avoid depending on the presence of `/dev/stdin` by using the 0th descriptor here instead. 0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
		err(1, "%s", "stdin");
		tobikUnsubmitted Done Inline Actions Can this not just be `f = stdin`? tobik: Can this not just be `f = stdin`?
		0mpAuthorUnsubmitted Done Inline Actions Good catch! The tests are still passing. 0mp: Good catch! The tests are still passing.
		fname = "stdin";
		0mpAuthorUnsubmitted Done Inline Actions Is `stdin` name here alright? Perhaps it could be changed to `-`? 0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
		} else {
if ((f = fopen(script->s, "r")) == NULL)		if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s);		err(1, "%s", script->s);
fname = script->s;		fname = script->s;
		}
state = ST_FILE;		state = ST_FILE;
goto again;		goto again;
case CU_STRING:		case CU_STRING:
if (((size_t)snprintf(string_ident,		if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >=		sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1)		sizeof(string_ident) - 1)
(void)strcpy(string_ident +		(void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\"");		sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines

View Options

devel/py-setuptools/Makefile

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines

static void add_compunit(enum e_cut, char *);		static void add_compunit(enum e_cut, char *);
static void add_file(char *);		static void add_file(char *);
static void usage(void);		static void usage(void);

int		int
main(int argc, char *argv[])		main(int argc, char *argv[])
{		{
int c, fflag;		int c, fflag, fflagstdin;
char *temp_arg;		char *temp_arg;

(void) setlocale(LC_ALL, "");		(void) setlocale(LC_ALL, "");

fflag = 0;		fflag = 0;
		fflagstdin = 0;
inplace = NULL;		inplace = NULL;

while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)		while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) {		switch (c) {
case 'r': /* Gnu sed compat */		case 'r': /* Gnu sed compat */
case 'E':		case 'E':
rflags = REG_EXTENDED;		rflags = REG_EXTENDED;
break;		break;
Show All 9 Lines	case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)		if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc");		err(1, "malloc");
strcpy(temp_arg, optarg);		strcpy(temp_arg, optarg);
strcat(temp_arg, "\n");		strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg);		add_compunit(CU_STRING, temp_arg);
break;		break;
case 'f':		case 'f':
fflag = 1;		fflag = 1;
		if (strcmp(optarg, "-") == 0)
		fflagstdin = 1;
add_compunit(CU_FILE, optarg);		add_compunit(CU_FILE, optarg);
break;		break;
case 'i':		case 'i':
inplace = optarg;		inplace = optarg;
ispan = 0; /* don't span across input files */		ispan = 0; /* don't span across input files */
break;		break;
case 'l':		case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)		if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Lines	main(int argc, char *argv[])
}		}

compile();		compile();

/* Continue with first and start second usage */		/* Continue with first and start second usage */
if (*argv)		if (*argv)
for (; *argv; argv++)		for (; *argv; argv++)
add_file(*argv);		add_file(*argv);
		else if (fflagstdin)
		0mpAuthorUnsubmitted Done Inline Actions There has to be at least one input file specified. 0mp: There has to be at least one input file specified.
		exit(rval);
else		else
add_file(NULL);		add_file(NULL);
process();		process();
cfclose(prog, NULL);		cfclose(prog, NULL);
if (fclose(stdout))		if (fclose(stdout))
err(1, "stdout");		err(1, "stdout");
exit(rval);		exit(rval);
}		}
Show All 27 Lines	case ST_EOF:
if (script == NULL) {		if (script == NULL) {
if (more != NULL)		if (more != NULL)
*more = 0;		*more = 0;
return (NULL);		return (NULL);
}		}
linenum = 0;		linenum = 0;
switch (script->type) {		switch (script->type) {
case CU_FILE:		case CU_FILE:
		if (strcmp(script->s, "-") == 0) {
		if ((f = fdopen(0, "r")) == NULL)
		0mpAuthorUnsubmitted Done Inline Actions I am not sure if it makes any difference if I try to avoid depending on the presence of `/dev/stdin` by using the 0th descriptor here instead. 0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
		err(1, "%s", "stdin");
		tobikUnsubmitted Done Inline Actions Can this not just be `f = stdin`? tobik: Can this not just be `f = stdin`?
		0mpAuthorUnsubmitted Done Inline Actions Good catch! The tests are still passing. 0mp: Good catch! The tests are still passing.
		fname = "stdin";
		0mpAuthorUnsubmitted Done Inline Actions Is `stdin` name here alright? Perhaps it could be changed to `-`? 0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
		} else {
if ((f = fopen(script->s, "r")) == NULL)		if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s);		err(1, "%s", script->s);
fname = script->s;		fname = script->s;
		}
state = ST_FILE;		state = ST_FILE;
goto again;		goto again;
case CU_STRING:		case CU_STRING:
if (((size_t)snprintf(string_ident,		if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >=		sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1)		sizeof(string_ident) - 1)
(void)strcpy(string_ident +		(void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\"");		sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines

View Options

devel/py-setuptools/distinfo

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines

static void add_compunit(enum e_cut, char *);		static void add_compunit(enum e_cut, char *);
static void add_file(char *);		static void add_file(char *);
static void usage(void);		static void usage(void);

int		int
main(int argc, char *argv[])		main(int argc, char *argv[])
{		{
int c, fflag;		int c, fflag, fflagstdin;
char *temp_arg;		char *temp_arg;

(void) setlocale(LC_ALL, "");		(void) setlocale(LC_ALL, "");

fflag = 0;		fflag = 0;
		fflagstdin = 0;
inplace = NULL;		inplace = NULL;

while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)		while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) {		switch (c) {
case 'r': /* Gnu sed compat */		case 'r': /* Gnu sed compat */
case 'E':		case 'E':
rflags = REG_EXTENDED;		rflags = REG_EXTENDED;
break;		break;
Show All 9 Lines	case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)		if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc");		err(1, "malloc");
strcpy(temp_arg, optarg);		strcpy(temp_arg, optarg);
strcat(temp_arg, "\n");		strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg);		add_compunit(CU_STRING, temp_arg);
break;		break;
case 'f':		case 'f':
fflag = 1;		fflag = 1;
		if (strcmp(optarg, "-") == 0)
		fflagstdin = 1;
add_compunit(CU_FILE, optarg);		add_compunit(CU_FILE, optarg);
break;		break;
case 'i':		case 'i':
inplace = optarg;		inplace = optarg;
ispan = 0; /* don't span across input files */		ispan = 0; /* don't span across input files */
break;		break;
case 'l':		case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)		if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Lines	main(int argc, char *argv[])
}		}

compile();		compile();

/* Continue with first and start second usage */		/* Continue with first and start second usage */
if (*argv)		if (*argv)
for (; *argv; argv++)		for (; *argv; argv++)
add_file(*argv);		add_file(*argv);
		else if (fflagstdin)
		0mpAuthorUnsubmitted Done Inline Actions There has to be at least one input file specified. 0mp: There has to be at least one input file specified.
		exit(rval);
else		else
add_file(NULL);		add_file(NULL);
process();		process();
cfclose(prog, NULL);		cfclose(prog, NULL);
if (fclose(stdout))		if (fclose(stdout))
err(1, "stdout");		err(1, "stdout");
exit(rval);		exit(rval);
}		}
Show All 27 Lines	case ST_EOF:
if (script == NULL) {		if (script == NULL) {
if (more != NULL)		if (more != NULL)
*more = 0;		*more = 0;
return (NULL);		return (NULL);
}		}
linenum = 0;		linenum = 0;
switch (script->type) {		switch (script->type) {
case CU_FILE:		case CU_FILE:
		if (strcmp(script->s, "-") == 0) {
		if ((f = fdopen(0, "r")) == NULL)
		0mpAuthorUnsubmitted Done Inline Actions I am not sure if it makes any difference if I try to avoid depending on the presence of `/dev/stdin` by using the 0th descriptor here instead. 0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
		err(1, "%s", "stdin");
		tobikUnsubmitted Done Inline Actions Can this not just be `f = stdin`? tobik: Can this not just be `f = stdin`?
		0mpAuthorUnsubmitted Done Inline Actions Good catch! The tests are still passing. 0mp: Good catch! The tests are still passing.
		fname = "stdin";
		0mpAuthorUnsubmitted Done Inline Actions Is `stdin` name here alright? Perhaps it could be changed to `-`? 0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
		} else {
if ((f = fopen(script->s, "r")) == NULL)		if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s);		err(1, "%s", script->s);
fname = script->s;		fname = script->s;
		}
state = ST_FILE;		state = ST_FILE;
goto again;		goto again;
case CU_STRING:		case CU_STRING:
if (((size_t)snprintf(string_ident,		if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >=		sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1)		sizeof(string_ident) - 1)
(void)strcpy(string_ident +		(void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\"");		sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines

View Options

devel/py-setuptools/files/patch-setuptoolscommandinstall_egg_info.py

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines

static void add_compunit(enum e_cut, char *);		static void add_compunit(enum e_cut, char *);
static void add_file(char *);		static void add_file(char *);
static void usage(void);		static void usage(void);

int		int
main(int argc, char *argv[])		main(int argc, char *argv[])
{		{
int c, fflag;		int c, fflag, fflagstdin;
char *temp_arg;		char *temp_arg;

(void) setlocale(LC_ALL, "");		(void) setlocale(LC_ALL, "");

fflag = 0;		fflag = 0;
		fflagstdin = 0;
inplace = NULL;		inplace = NULL;

while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)		while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
switch (c) {		switch (c) {
case 'r': /* Gnu sed compat */		case 'r': /* Gnu sed compat */
case 'E':		case 'E':
rflags = REG_EXTENDED;		rflags = REG_EXTENDED;
break;		break;
Show All 9 Lines	case 'e':
if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)		if ((temp_arg = malloc(strlen(optarg) + 2)) == NULL)
err(1, "malloc");		err(1, "malloc");
strcpy(temp_arg, optarg);		strcpy(temp_arg, optarg);
strcat(temp_arg, "\n");		strcat(temp_arg, "\n");
add_compunit(CU_STRING, temp_arg);		add_compunit(CU_STRING, temp_arg);
break;		break;
case 'f':		case 'f':
fflag = 1;		fflag = 1;
		if (strcmp(optarg, "-") == 0)
		fflagstdin = 1;
add_compunit(CU_FILE, optarg);		add_compunit(CU_FILE, optarg);
break;		break;
case 'i':		case 'i':
inplace = optarg;		inplace = optarg;
ispan = 0; /* don't span across input files */		ispan = 0; /* don't span across input files */
break;		break;
case 'l':		case 'l':
if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)		if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
Show All 20 Lines	main(int argc, char *argv[])
}		}

compile();		compile();

/* Continue with first and start second usage */		/* Continue with first and start second usage */
if (*argv)		if (*argv)
for (; *argv; argv++)		for (; *argv; argv++)
add_file(*argv);		add_file(*argv);
		else if (fflagstdin)
		0mpAuthorUnsubmitted Done Inline Actions There has to be at least one input file specified. 0mp: There has to be at least one input file specified.
		exit(rval);
else		else
add_file(NULL);		add_file(NULL);
process();		process();
cfclose(prog, NULL);		cfclose(prog, NULL);
if (fclose(stdout))		if (fclose(stdout))
err(1, "stdout");		err(1, "stdout");
exit(rval);		exit(rval);
}		}
Show All 27 Lines	case ST_EOF:
if (script == NULL) {		if (script == NULL) {
if (more != NULL)		if (more != NULL)
*more = 0;		*more = 0;
return (NULL);		return (NULL);
}		}
linenum = 0;		linenum = 0;
switch (script->type) {		switch (script->type) {
case CU_FILE:		case CU_FILE:
		if (strcmp(script->s, "-") == 0) {
		if ((f = fdopen(0, "r")) == NULL)
		0mpAuthorUnsubmitted Done Inline Actions I am not sure if it makes any difference if I try to avoid depending on the presence of `/dev/stdin` by using the 0th descriptor here instead. 0mp: I am not sure if it makes any difference if I try to avoid depending on the presence of…
		err(1, "%s", "stdin");
		tobikUnsubmitted Done Inline Actions Can this not just be `f = stdin`? tobik: Can this not just be `f = stdin`?
		0mpAuthorUnsubmitted Done Inline Actions Good catch! The tests are still passing. 0mp: Good catch! The tests are still passing.
		fname = "stdin";
		0mpAuthorUnsubmitted Done Inline Actions Is `stdin` name here alright? Perhaps it could be changed to `-`? 0mp: Is `stdin` name here alright? Perhaps it could be changed to `-`?
		} else {
if ((f = fopen(script->s, "r")) == NULL)		if ((f = fopen(script->s, "r")) == NULL)
err(1, "%s", script->s);		err(1, "%s", script->s);
fname = script->s;		fname = script->s;
		}
state = ST_FILE;		state = ST_FILE;
goto again;		goto again;
case CU_STRING:		case CU_STRING:
if (((size_t)snprintf(string_ident,		if (((size_t)snprintf(string_ident,
sizeof(string_ident), "\"%s\"", script->s)) >=		sizeof(string_ident), "\"%s\"", script->s)) >=
sizeof(string_ident) - 1)		sizeof(string_ident) - 1)
(void)strcpy(string_ident +		(void)strcpy(string_ident +
sizeof(string_ident) - 6, " ...\"");		sizeof(string_ident) - 6, " ...\"");
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines