← Back to branch summary

~ubuntu-branches/debian/jessie/glib2.0/jessie

« back to all changes in this revision

Viewing changes to glib/gspawn-win32-helper.c

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-02-15 13:00:43 UTC
  • mto: (1.4.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 70.
  • Revision ID: james.westby@ubuntu.com-20090215130043-6snh45flhit8oalb
Tags: upstream-2.18.4
Import upstream version 2.18.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
glib/gspawn-win32-helper.c
30
30
 
31
31
 
32
32
static void
33
 
write_err_and_exit (gint fd,
34
 
                    gint msg)
 
33
write_err_and_exit (gint    fd,
 
34
                    gintptr msg)
35
35
{
36
 
  gint en = errno;
 
36
  gintptr en = errno;
37
37
  
38
 
  write (fd, &msg, sizeof(msg));
39
 
  write (fd, &en, sizeof(en));
 
38
  write (fd, &msg, sizeof(gintptr));
 
39
  write (fd, &en, sizeof(gintptr));
40
40
  
41
41
  _exit (1);
42
42
}
147
147
  return argc;
148
148
}
149
149
 
 
150
#ifndef HELPER_CONSOLE
150
151
int _stdcall
151
152
WinMain (struct HINSTANCE__ *hInstance,
152
153
         struct HINSTANCE__ *hPrevInstance,
153
154
         char               *lpszCmdLine,
154
155
         int                 nCmdShow)
 
156
#else
 
157
int
 
158
main (int ignored_argc, char **ignored_argv)
 
159
#endif
155
160
{
156
161
  int child_err_report_fd = -1;
157
162
  int helper_sync_fd = -1;
158
163
  int i;
159
164
  int fd;
160
165
  int mode;
161
 
  int handle;
 
166
  gintptr handle;
162
167
  int saved_errno;
163
 
  int no_error = CHILD_NO_ERROR;
164
 
  int zero = 0;
 
168
  gintptr no_error = CHILD_NO_ERROR;
165
169
  gint argv_zero_offset = ARG_PROGRAM;
166
170
  wchar_t **new_wargv;
167
171
  int argc;
321
325
    write_err_and_exit (child_err_report_fd, CHILD_SPAWN_FAILED);
322
326
 
323
327
  write (child_err_report_fd, &no_error, sizeof (no_error));
324
 
  if (mode == P_NOWAIT)
325
 
    write (child_err_report_fd, &handle, sizeof (handle));
326
 
  else
327
 
    write (child_err_report_fd, &zero, sizeof (zero));
 
328
  write (child_err_report_fd, &handle, sizeof (handle));
328
329
 
329
330
  read (helper_sync_fd, &c, 1);
330
331