Changeset 391 for python/trunk/Demo/embed/demo.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Demo/embed/demo.c (modified) (3 diffs)

python/trunk/Demo/embed/demo.c

@@ -7 +7 @@
 main(int argc, char **argv)
 {
-        /* Pass argv[0] to the Python interpreter */
-        Py_SetProgramName(argv[0]);
+    /* Pass argv[0] to the Python interpreter */
+    Py_SetProgramName(argv[0]);
 
-        /* Initialize the Python interpreter.  Required. */
-        Py_Initialize();
+    /* Initialize the Python interpreter.  Required. */
+    Py_Initialize();
 
-        /* Add a static module */
-        initxyzzy();
+    /* Add a static module */
+    initxyzzy();
 
-        /* Define sys.argv.  It is up to the application if you
-           want this; you can also let it undefined (since the Python 
-           code is generally not a main program it has no business
-           touching sys.argv...) */
-        PySys_SetArgv(argc, argv);
+    /* Define sys.argv.  It is up to the application if you
+       want this; you can also leave it undefined (since the Python
+       code is generally not a main program it has no business
+       touching sys.argv...) 
 
-        /* Do some application specific code */
-        printf("Hello, brave new world\n\n");
+       If the third argument is true, sys.path is modified to include
+       either the directory containing the script named by argv[0], or
+       the current working directory.  This can be risky; if you run
+       an application embedding Python in a directory controlled by
+       someone else, attackers could put a Trojan-horse module in the
+       directory (say, a file named os.py) that your application would
+       then import and run.
+    */
+    PySys_SetArgvEx(argc, argv, 0);
 
-        /* Execute some Python statements (in module __main__) */
-        PyRun_SimpleString("import sys\n");
-        PyRun_SimpleString("print sys.builtin_module_names\n");
-        PyRun_SimpleString("print sys.modules.keys()\n");
-        PyRun_SimpleString("print sys.executable\n");
-        PyRun_SimpleString("print sys.argv\n");
+    /* Do some application specific code */
+    printf("Hello, brave new world\n\n");
 
-        /* Note that you can call any public function of the Python
-           interpreter here, e.g. call_object(). */
+    /* Execute some Python statements (in module __main__) */
+    PyRun_SimpleString("import sys\n");
+    PyRun_SimpleString("print sys.builtin_module_names\n");
+    PyRun_SimpleString("print sys.modules.keys()\n");
+    PyRun_SimpleString("print sys.executable\n");
+    PyRun_SimpleString("print sys.argv\n");
 
-        /* Some more application specific code */
-        printf("\nGoodbye, cruel world\n");
+    /* Note that you can call any public function of the Python
+       interpreter here, e.g. call_object(). */
 
-        /* Exit, cleaning up the interpreter */
-        Py_Exit(0);
-        /*NOTREACHED*/
+    /* Some more application specific code */
+    printf("\nGoodbye, cruel world\n");
+
+    /* Exit, cleaning up the interpreter */
+    Py_Exit(0);
+    /*NOTREACHED*/
 }
 
@@ -49 +58 @@
 xyzzy_foo(PyObject *self, PyObject* args)
 {
-        return PyInt_FromLong(42L);
+    return PyInt_FromLong(42L);
 }
 
 static PyMethodDef xyzzy_methods[] = {
-        {"foo",         xyzzy_foo,      METH_NOARGS,
-         "Return the meaning of everything."},
-        {NULL,          NULL}           /* sentinel */
+    {"foo",             xyzzy_foo,      METH_NOARGS,
+     "Return the meaning of everything."},
+    {NULL,              NULL}           /* sentinel */
 };
 
@@ -61 +70 @@
 initxyzzy(void)
 {
-        PyImport_AddModule("xyzzy");
-        Py_InitModule("xyzzy", xyzzy_methods);
+    PyImport_AddModule("xyzzy");
+    Py_InitModule("xyzzy", xyzzy_methods);
 }