This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12233

cext: remove inline rewriting of argv
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3aa1b7ded52c: cext: remove inline rewriting of argv
Summary

This only worked on Python 2. And since we dropped support for Python 2,
we can drop support for this functionality.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 1 2022, 7:22 PM
Alphare accepted this revision.Mar 2 2022, 5:22 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:22 AM
indygreg added a commit: rHG3aa1b7ded52c: cext: remove inline rewriting of argv.Mar 2 2022, 7:43 AM
Closed by commit rHG3aa1b7ded52c: cext: remove inline rewriting of argv (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/osutil.c (42 lines)
Mmercurial/cext/util.h (4 lines)

Diff 32349

mercurial/cext/osutil.c

#endif /* CMSG_LEN */ #endif /* CMSG_LEN */
/* allow disabling setprocname via compiler flags */ /* allow disabling setprocname via compiler flags */
#ifndef SETPROCNAME_USE_NONE #ifndef SETPROCNAME_USE_NONE
#if defined(HAVE_SETPROCTITLE) #if defined(HAVE_SETPROCTITLE)
/* setproctitle is the first choice - available in FreeBSD */ /* setproctitle is the first choice - available in FreeBSD */
#define SETPROCNAME_USE_SETPROCTITLE #define SETPROCNAME_USE_SETPROCTITLE
#elif (defined(__linux__) || defined(__APPLE__)) && PY_MAJOR_VERSION == 2
/* rewrite the argv buffer in place - works in Linux and OS X. Py_GetArgcArgv
* in Python 3 returns the copied wchar_t **argv, thus unsupported. */
#define SETPROCNAME_USE_ARGVREWRITE
#else #else
#define SETPROCNAME_USE_NONE #define SETPROCNAME_USE_NONE
#endif #endif
#endif /* ndef SETPROCNAME_USE_NONE */ #endif /* ndef SETPROCNAME_USE_NONE */
#ifndef SETPROCNAME_USE_NONE #ifndef SETPROCNAME_USE_NONE
static PyObject *setprocname(PyObject *self, PyObject *args) static PyObject *setprocname(PyObject *self, PyObject *args)
{ {
const char *name = NULL; const char *name = NULL;
if (!PyArg_ParseTuple(args, "y", &name)) if (!PyArg_ParseTuple(args, "y", &name))
return NULL; return NULL;
#if defined(SETPROCNAME_USE_SETPROCTITLE) #if defined(SETPROCNAME_USE_SETPROCTITLE)
setproctitle("%s", name); setproctitle("%s", name);
#elif defined(SETPROCNAME_USE_ARGVREWRITE)
{
static char *argvstart = NULL;
static size_t argvsize = 0;
if (argvstart == NULL) {
int argc = 0, i;
char **argv = NULL;
char *argvend;
extern void Py_GetArgcArgv(int *argc, char ***argv);
Py_GetArgcArgv(&argc, &argv);
/* Py_GetArgcArgv may not do much if a custom python
* launcher is used that doesn't record the information
* it needs. Let's handle this gracefully instead of
* segfaulting. */
if (argv != NULL)
argvend = argvstart = argv[0];
else
argvend = argvstart = NULL;
/* Check the memory we can use. Typically, argv[i] and
* argv[i + 1] are continuous. */
for (i = 0; i < argc; ++i) {
size_t len;
if (argv[i] > argvend || argv[i] < argvstart)
break; /* not continuous */
len = strlen(argv[i]);
argvend = argv[i] + len + 1 /* '\0' */;
}
if (argvend > argvstart) /* sanity check */
argvsize = argvend - argvstart;
}
if (argvstart && argvsize > 1) {
int n = snprintf(argvstart, argvsize, "%s", name);
if (n >= 0 && (size_t)n < argvsize)
memset(argvstart + n, 0, argvsize - n);
}
}
#endif #endif
Py_RETURN_NONE; Py_RETURN_NONE;
} }
#endif /* ndef SETPROCNAME_USE_NONE */ #endif /* ndef SETPROCNAME_USE_NONE */
#if defined(HAVE_BSD_STATFS) #if defined(HAVE_BSD_STATFS)
static const char *describefstype(const struct statfs *pbuf) static const char *describefstype(const struct statfs *pbuf)

mercurial/cext/util.h

/* /*
util.h - utility functions for interfacing with the various python APIs. util.h - utility functions for interfacing with the various python APIs.
This software may be used and distributed according to the terms of This software may be used and distributed according to the terms of
the GNU General Public License, incorporated herein by reference. the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _HG_UTIL_H_ #ifndef _HG_UTIL_H_
#define _HG_UTIL_H_ #define _HG_UTIL_H_
#include "compat.h" #include "compat.h"
#if PY_MAJOR_VERSION >= 3
#define IS_PY3K
#endif
/* clang-format off */ /* clang-format off */
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
int flags; int flags;
int mode; int mode;
int size; int size;
int mtime_s; int mtime_s;
int mtime_ns; int mtime_ns;