comparison src/xsmfns.c @ 65412:3a9693f993b2

(smc_save_yourself_CB): Use get_current_dir_name.

65411:29cca0143d6f

#include "lisp.h"
#include "termhooks.h"
#include "termopts.h"
#include "xterm.h"

#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif /* not MAXPATHLEN */


/* The user login name.  */

extern Lisp_Object Vuser_login_name;

  SmPropValue values[20];
  int val_idx = 0;
  int props_idx = 0;

  char cwd[MAXPATHLEN+1];
  char *smid_opt;

  /* How to start a new instance of Emacs.  */
  props[props_idx] = &prop_ptr[props_idx];
  props[props_idx]->name = SmCloneCommand;

  props[props_idx]->vals = &values[val_idx++];
  props[props_idx]->vals[0].length = strlen (SDATA (Vuser_login_name));
  props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
  ++props_idx;

  /* The current directory property, not mandatory.  */
#ifdef HAVE_GETCWD
  if (getcwd (cwd, MAXPATHLEN+1) != 0)
#else
  if (getwd (cwd) != 0)
#endif
    {
      props[props_idx] = &prop_ptr[props_idx];
      props[props_idx]->name = SmCurrentDirectory;
      props[props_idx]->type = SmARRAY8;
      props[props_idx]->num_vals = 1;

  SmcSetProperties (smcConn, props_idx, props);

  xfree (smid_opt);

  /* See if we maybe shall interact with the user.  */
  if (interactStyle != SmInteractStyleAny
      || ! shutdown
      || saveType == SmSaveLocal

65412:3a9693f993b2

#include "lisp.h"
#include "termhooks.h"
#include "termopts.h"
#include "xterm.h"

extern char * get_current_dir_name ();

/* The user login name.  */

extern Lisp_Object Vuser_login_name;

  SmPropValue values[20];
  int val_idx = 0;
  int props_idx = 0;

  char *cwd = NULL;
  char *smid_opt;

  /* How to start a new instance of Emacs.  */
  props[props_idx] = &prop_ptr[props_idx];
  props[props_idx]->name = SmCloneCommand;

  props[props_idx]->vals = &values[val_idx++];
  props[props_idx]->vals[0].length = strlen (SDATA (Vuser_login_name));
  props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
  ++props_idx;

  cwd = get_current_dir_name ();

  if (cwd)
    {
      props[props_idx] = &prop_ptr[props_idx];
      props[props_idx]->name = SmCurrentDirectory;
      props[props_idx]->type = SmARRAY8;
      props[props_idx]->num_vals = 1;

  SmcSetProperties (smcConn, props_idx, props);

  xfree (smid_opt);

  if (cwd)
    free (cwd);

  /* See if we maybe shall interact with the user.  */
  if (interactStyle != SmInteractStyleAny
      || ! shutdown
      || saveType == SmSaveLocal