To: vim_dev@googlegroups.com

Subject: Patch 7.3.161

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.161

Problem:    Items on the stack may be too big.

Solution:   Make items static or allocate them.

Files:	    src/eval.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c,

	    src/fileio.c, src/hardcopy.c, src/quickfix.c, src/main.c,

	    src/netbeans.c, src/spell.c, src/tag.c, src/vim.h, src/xxd/xxd.c

*** ../vim-7.3.160/src/eval.c	2011-04-11 13:46:07.000000000 +0200

--- src/eval.c	2011-04-11 21:05:50.000000000 +0200

***************

*** 11100,11117 ****

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     char_u	cwd[MAXPATHL];

      rettv->v_type = VAR_STRING;

!     if (mch_dirname(cwd, MAXPATHL) == FAIL)

! 	rettv->vval.v_string = NULL;

!     else

      {

! 	rettv->vval.v_string = vim_strsave(cwd);

  #ifdef BACKSLASH_IN_FILENAME

! 	if (rettv->vval.v_string != NULL)

! 	    slash_adjust(rettv->vval.v_string);

  #endif

      }

  }

--- 11100,11121 ----

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     char_u	*cwd;

      rettv->v_type = VAR_STRING;

!     rettv->vval.v_string = NULL;

!     cwd = alloc(MAXPATHL);

!     if (cwd != NULL)

      {

! 	if (mch_dirname(cwd, MAXPATHL) != FAIL)

! 	{

! 	    rettv->vval.v_string = vim_strsave(cwd);

  #ifdef BACKSLASH_IN_FILENAME

! 	    if (rettv->vval.v_string != NULL)

! 		slash_adjust(rettv->vval.v_string);

  #endif

+ 	}

+ 	vim_free(cwd);

      }

  }

***************

*** 14938,14943 ****

--- 14942,14950 ----

      typval_T	*rettv;

  {

      char_u	*p;

+ #ifdef HAVE_READLINK

+     char_u	*buf = NULL;

+ #endif

      p = get_tv_string(&argvars[0]);

  #ifdef FEAT_SHORTCUT

***************

*** 14953,14959 ****

  #else

  # ifdef HAVE_READLINK

      {

- 	char_u	buf[MAXPATHL + 1];

  	char_u	*cpy;

  	int	len;

  	char_u	*remain = NULL;

--- 14960,14965 ----

***************

*** 14981,14986 ****

--- 14987,14996 ----

  	    q[-1] = NUL;

  	}

+ 	buf = alloc(MAXPATHL + 1);

+ 	if (buf == NULL)

+ 	    goto fail;

+ 

  	for (;;)

  	{

  	    for (;;)

***************

*** 15124,15129 ****

--- 15134,15140 ----

  #ifdef HAVE_READLINK

  fail:

+     vim_free(buf);

  #endif

      rettv->v_type = VAR_STRING;

  }

***************

*** 17604,17621 ****

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     char_u	fname[MAXPATHL + 1];

      tagname_T	tn;

      int		first;

      if (rettv_list_alloc(rettv) == FAIL)

  	return;

      for (first = TRUE; ; first = FALSE)

  	if (get_tagfname(&tn, first, fname) == FAIL

  		|| list_append_string(rettv->vval.v_list, fname, -1) == FAIL)

  	    break;

      tagname_free(&tn;;

  }

  /*

--- 17615,17636 ----

      typval_T	*argvars UNUSED;

      typval_T	*rettv;

  {

!     char_u	*fname;

      tagname_T	tn;

      int		first;

      if (rettv_list_alloc(rettv) == FAIL)

  	return;

+     fname = alloc(MAXPATHL);

+     if (fname == NULL)

+ 	return;

      for (first = TRUE; ; first = FALSE)

  	if (get_tagfname(&tn, first, fname) == FAIL

  		|| list_append_string(rettv->vval.v_list, fname, -1) == FAIL)

  	    break;

      tagname_free(&tn;;

+     vim_free(fname);

  }

  /*

*** ../vim-7.3.160/src/ex_cmds.c	2011-02-01 13:48:47.000000000 +0100

--- src/ex_cmds.c	2011-04-11 20:51:34.000000000 +0200

***************

*** 2777,2783 ****

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	    if (p_confirm || cmdmod.confirm)

  	    {

! 		char_u	buff[IOSIZE];

  		dialog_msg(buff, _("Overwrite existing file \"%s\"?"), fname);

  		if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) != VIM_YES)

--- 2777,2783 ----

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	    if (p_confirm || cmdmod.confirm)

  	    {

! 		char_u	buff[DIALOG_MSG_SIZE];

  		dialog_msg(buff, _("Overwrite existing file \"%s\"?"), fname);

  		if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) != VIM_YES)

***************

*** 2795,2801 ****

  	/* For ":w! filename" check that no swap file exists for "filename". */

  	if (other && !emsg_silent)

  	{

! 	    char_u	dir[MAXPATHL];

  	    char_u	*p;

  	    int		r;

  	    char_u	*swapname;

--- 2795,2801 ----

  	/* For ":w! filename" check that no swap file exists for "filename". */

  	if (other && !emsg_silent)

  	{

! 	    char_u	*dir;

  	    char_u	*p;

  	    int		r;

  	    char_u	*swapname;

***************

*** 2806,2825 ****

  	     * Use 'shortname' of the current buffer, since there is no buffer

  	     * for the written file. */

  	    if (*p_dir == NUL)

  		STRCPY(dir, ".");

  	    else

  	    {

  		p = p_dir;

  		copy_option_part(&p, dir, MAXPATHL, ",");

  	    }

  	    swapname = makeswapname(fname, ffname, curbuf, dir);

  	    r = vim_fexists(swapname);

  	    if (r)

  	    {

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  		if (p_confirm || cmdmod.confirm)

  		{

! 		    char_u	buff[IOSIZE];

  		    dialog_msg(buff,

  			    _("Swap file \"%s\" exists, overwrite anyway?"),

--- 2806,2834 ----

  	     * Use 'shortname' of the current buffer, since there is no buffer

  	     * for the written file. */

  	    if (*p_dir == NUL)

+ 	    {

+ 		dir = alloc(5);

+ 		if (dir == NULL)

+ 		    return FAIL;

  		STRCPY(dir, ".");

+ 	    }

  	    else

  	    {

+ 		dir = alloc(MAXPATHL);

+ 		if (dir == NULL)

+ 		    return FAIL;

  		p = p_dir;

  		copy_option_part(&p, dir, MAXPATHL, ",");

  	    }

  	    swapname = makeswapname(fname, ffname, curbuf, dir);

+ 	    vim_free(dir);

  	    r = vim_fexists(swapname);

  	    if (r)

  	    {

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  		if (p_confirm || cmdmod.confirm)

  		{

! 		    char_u	buff[DIALOG_MSG_SIZE];

  		    dialog_msg(buff,

  			    _("Swap file \"%s\" exists, overwrite anyway?"),

***************

*** 2969,2975 ****

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL)

  	{

! 	    char_u	buff[IOSIZE];

  	    if (buf->b_p_ro)

  		dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),

--- 2978,2984 ----

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL)

  	{

! 	    char_u	buff[DIALOG_MSG_SIZE];

  	    if (buf->b_p_ro)

  		dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),

*** ../vim-7.3.160/src/ex_cmds2.c	2011-02-25 14:46:06.000000000 +0100

--- src/ex_cmds2.c	2011-04-11 20:51:40.000000000 +0200

***************

*** 1492,1498 ****

      buf_T	*buf;

      int		checkall;	/* may abandon all changed buffers */

  {

!     char_u	buff[IOSIZE];

      int		ret;

      buf_T	*buf2;

--- 1492,1498 ----

      buf_T	*buf;

      int		checkall;	/* may abandon all changed buffers */

  {

!     char_u	buff[DIALOG_MSG_SIZE];

      int		ret;

      buf_T	*buf2;

*** ../vim-7.3.160/src/ex_docmd.c	2011-04-11 16:56:29.000000000 +0200

--- src/ex_docmd.c	2011-04-11 21:20:35.000000000 +0200

***************

*** 5093,5106 ****

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	    if ((p_confirm || cmdmod.confirm) && curbuf->b_fname != NULL)

  	    {

! 		char_u	buff[IOSIZE];

  		if (n == 1)

  		    vim_strncpy(buff,

  			    (char_u *)_("1 more file to edit.  Quit anyway?"),

! 								  IOSIZE - 1);

  		else

! 		    vim_snprintf((char *)buff, IOSIZE,

  			      _("%d more files to edit.  Quit anyway?"), n);

  		if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 1) == VIM_YES)

  		    return OK;

--- 5093,5106 ----

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

  	    if ((p_confirm || cmdmod.confirm) && curbuf->b_fname != NULL)

  	    {

! 		char_u	buff[DIALOG_MSG_SIZE];

  		if (n == 1)

  		    vim_strncpy(buff,

  			    (char_u *)_("1 more file to edit.  Quit anyway?"),

! 							 DIALOG_MSG_SIZE - 1);

  		else

! 		    vim_snprintf((char *)buff, DIALOG_MSG_SIZE,

  			      _("%d more files to edit.  Quit anyway?"), n);

  		if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 1) == VIM_YES)

  		    return OK;

***************

*** 8926,8960 ****

  		failed = TRUE;

  	    if (eap->cmdidx == CMD_mksession)

  	    {

! 		char_u dirnow[MAXPATHL];	/* current directory */

! 		/*

! 		 * Change to session file's dir.

! 		 */

! 		if (mch_dirname(dirnow, MAXPATHL) == FAIL

! 					    || mch_chdir((char *)dirnow) != 0)

! 		    *dirnow = NUL;

! 		if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))

! 		{

! 		    if (vim_chdirfile(fname) == OK)

! 			shorten_fnames(TRUE);

! 		}

! 		else if (*dirnow != NUL

! 			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)

  		{

! 		    if (mch_chdir((char *)globaldir) == 0)

! 			shorten_fnames(TRUE);

! 		}

! 		failed |= (makeopens(fd, dirnow) == FAIL);

! 		/* restore original dir */

! 		if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR)

  			|| ((ssop_flags & SSOP_CURDIR) && globaldir != NULL)))

! 		{

! 		    if (mch_chdir((char *)dirnow) != 0)

! 			EMSG(_(e_prev_dir));

! 		    shorten_fnames(TRUE);

  		}

  	    }

  	    else

--- 8926,8967 ----

  		failed = TRUE;

  	    if (eap->cmdidx == CMD_mksession)

  	    {

! 		char_u *dirnow;	 /* current directory */

! 		dirnow = alloc(MAXPATHL);

! 		if (dirnow == NULL)

! 		    failed = TRUE;

! 		else

  		{

! 		    /*

! 		     * Change to session file's dir.

! 		     */

! 		    if (mch_dirname(dirnow, MAXPATHL) == FAIL

! 					    || mch_chdir((char *)dirnow) != 0)

! 			*dirnow = NUL;

! 		    if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))

! 		    {

! 			if (vim_chdirfile(fname) == OK)

! 			    shorten_fnames(TRUE);

! 		    }

! 		    else if (*dirnow != NUL

! 			   && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)

! 		    {

! 			if (mch_chdir((char *)globaldir) == 0)

! 			    shorten_fnames(TRUE);

! 		    }

! 		    failed |= (makeopens(fd, dirnow) == FAIL);

! 		    /* restore original dir */

! 		    if (*dirnow != NUL && ((ssop_flags & SSOP_SESDIR)

  			|| ((ssop_flags & SSOP_CURDIR) && globaldir != NULL)))

! 		    {

! 			if (mch_chdir((char *)dirnow) != 0)

! 			    EMSG(_(e_prev_dir));

! 			shorten_fnames(TRUE);

! 		    }

! 		    vim_free(dirnow);

  		}

  	    }

  	    else

***************

*** 8985,8994 ****

  	else if (eap->cmdidx == CMD_mksession)

  	{

  	    /* successful session write - set this_session var */

! 	    char_u	tbuf[MAXPATHL];

! 	    if (vim_FullName(fname, tbuf, MAXPATHL, FALSE) == OK)

! 		set_vim_var_string(VV_THIS_SESSION, tbuf, -1);

  	}

  #endif

  #ifdef MKSESSION_NL

--- 8992,9006 ----

  	else if (eap->cmdidx == CMD_mksession)

  	{

  	    /* successful session write - set this_session var */

! 	    char_u	*tbuf;

! 	    tbuf = alloc(MAXPATHL);

! 	    if (tbuf != NULL)

! 	    {

! 		if (vim_FullName(fname, tbuf, MAXPATHL, FALSE) == OK)

! 		    set_vim_var_string(VV_THIS_SESSION, tbuf, -1);

! 		vim_free(tbuf);

! 	    }

  	}

  #endif

  #ifdef MKSESSION_NL

***************

*** 10677,10683 ****

      unsigned	*flagp;

  {

      int		i;

!     char_u	buf[MAXPATHL];

      char_u	*s;

      if (gap->ga_len == 0)

--- 10689,10695 ----

      unsigned	*flagp;

  {

      int		i;

!     char_u	*buf = NULL;

      char_u	*s;

      if (gap->ga_len == 0)

***************

*** 10692,10702 ****

  	{

  	    if (fullname)

  	    {

! 		(void)vim_FullName(s, buf, MAXPATHL, FALSE);

! 		s = buf;

  	    }

  	    if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL)

  		return FAIL;

  	}

      }

      return put_eol(fd);

--- 10704,10722 ----

  	{

  	    if (fullname)

  	    {

! 		buf = alloc(MAXPATHL);

! 		if (buf != NULL)

! 		{

! 		    (void)vim_FullName(s, buf, MAXPATHL, FALSE);

! 		    s = buf;

! 		}

  	    }

  	    if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL)

+ 	    {

+ 		vim_free(buf);

  		return FAIL;

+ 	    }

+ 	    vim_free(buf);

  	}

      }

      return put_eol(fd);

***************

*** 10925,10931 ****

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO)

  /*

!  * Make a dialog message in "buff[IOSIZE]".

   * "format" must contain "%s".

   */

      void

--- 10945,10951 ----

  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO)

  /*

!  * Make a dialog message in "buff[DIALOG_MSG_SIZE]".

   * "format" must contain "%s".

   */

      void

***************

*** 10936,10942 ****

  {

      if (fname == NULL)

  	fname = (char_u *)_("Untitled");

!     vim_snprintf((char *)buff, IOSIZE, format, fname);

  }

  #endif

--- 10956,10962 ----

  {

      if (fname == NULL)

  	fname = (char_u *)_("Untitled");

!     vim_snprintf((char *)buff, DIALOG_MSG_SIZE, format, fname);

  }

  #endif

*** ../vim-7.3.160/src/fileio.c	2011-02-25 16:52:13.000000000 +0100

--- src/fileio.c	2011-04-11 18:35:10.000000000 +0200

***************

*** 6023,6037 ****

  shorten_fname1(full_path)

      char_u	*full_path;

  {

!     char_u	dirname[MAXPATHL];

      char_u	*p = full_path;

      if (mch_dirname(dirname, MAXPATHL) == OK)

      {

  	p = shorten_fname(full_path, dirname);

  	if (p == NULL || *p == NUL)

  	    p = full_path;

      }

      return p;

  }

  #endif

--- 6023,6041 ----

  shorten_fname1(full_path)

      char_u	*full_path;

  {

!     char_u	*dirname;

      char_u	*p = full_path;

+     dirname = alloc(MAXPATHL);

+     if (dirname == NULL)

+ 	return full_path;

      if (mch_dirname(dirname, MAXPATHL) == OK)

      {

  	p = shorten_fname(full_path, dirname);

  	if (p == NULL || *p == NUL)

  	    p = full_path;

      }

+     vim_free(dirname);

      return p;

  }

  #endif

*** ../vim-7.3.160/src/hardcopy.c	2011-04-11 16:56:29.000000000 +0200

--- src/hardcopy.c	2011-04-11 18:23:38.000000000 +0200

***************

*** 1759,1765 ****

      char	*name;

      struct prt_ps_resource_S *resource;

  {

!     char_u	buffer[MAXPATHL + 1];

      vim_strncpy(resource->name, (char_u *)name, 63);

      /* Look for named resource file in runtimepath */

--- 1759,1770 ----

      char	*name;

      struct prt_ps_resource_S *resource;

  {

!     char_u	*buffer;

!     int		retval;

! 

!     buffer = alloc(MAXPATHL + 1);

!     if (buffer == NULL)

! 	return FALSE;

      vim_strncpy(resource->name, (char_u *)name, 63);

      /* Look for named resource file in runtimepath */

***************

*** 1768,1776 ****

      vim_strcat(buffer, (char_u *)name, MAXPATHL);

      vim_strcat(buffer, (char_u *)".ps", MAXPATHL);

      resource->filename[0] = NUL;

!     return (do_in_runtimepath(buffer, FALSE, prt_resource_name,

  							   resource->filename)

  	    && resource->filename[0] != NUL);

  }

  /* PS CR and LF characters have platform independent values */

--- 1773,1783 ----

      vim_strcat(buffer, (char_u *)name, MAXPATHL);

      vim_strcat(buffer, (char_u *)".ps", MAXPATHL);

      resource->filename[0] = NUL;

!     retval = (do_in_runtimepath(buffer, FALSE, prt_resource_name,

  							   resource->filename)

  	    && resource->filename[0] != NUL);

+     vim_free(buffer);

+     return retval;

  }

  /* PS CR and LF characters have platform independent values */

***************

*** 2848,2862 ****

      double      right;

      double      top;

      double      bottom;

!     struct prt_ps_resource_S res_prolog;

!     struct prt_ps_resource_S res_encoding;

      char	buffer[256];

      char_u      *p_encoding;

      char_u	*p;

  #ifdef FEAT_MBYTE

!     struct prt_ps_resource_S res_cidfont;

!     struct prt_ps_resource_S res_cmap;

  #endif

      /*

       * PS DSC Header comments - no PS code!

--- 2855,2887 ----

      double      right;

      double      top;

      double      bottom;

!     struct prt_ps_resource_S *res_prolog;

!     struct prt_ps_resource_S *res_encoding;

      char	buffer[256];

      char_u      *p_encoding;

      char_u	*p;

  #ifdef FEAT_MBYTE

!     struct prt_ps_resource_S *res_cidfont;

!     struct prt_ps_resource_S *res_cmap;

  #endif

+     int		retval = FALSE;

+ 

+     res_prolog = (struct prt_ps_resource_S *)

+ 				      alloc(sizeof(struct prt_ps_resource_S));

+     res_encoding = (struct prt_ps_resource_S *)

+ 				      alloc(sizeof(struct prt_ps_resource_S));

+ #ifdef FEAT_MBYTE

+     res_cidfont = (struct prt_ps_resource_S *)

+ 				      alloc(sizeof(struct prt_ps_resource_S));

+     res_cmap = (struct prt_ps_resource_S *)

+ 				      alloc(sizeof(struct prt_ps_resource_S));

+ #endif

+     if (res_prolog == NULL || res_encoding == NULL

+ #ifdef FEAT_MBYTE

+ 	    || res_cidfont == NULL || res_cmap == NULL

+ #endif

+        )

+ 	goto theend;

      /*

       * PS DSC Header comments - no PS code!

***************

*** 2932,2958 ****

  #endif

      /* Search for external resources VIM supplies */

!     if (!prt_find_resource("prolog", &res_prolog))

      {

  	EMSG(_("E456: Can't find PostScript resource file \"prolog.ps\""));

  	return FALSE;

      }

!     if (!prt_open_resource(&res_prolog))

  	return FALSE;

!     if (!prt_check_resource(&res_prolog, PRT_PROLOG_VERSION))

  	return FALSE;

  #ifdef FEAT_MBYTE

      if (prt_out_mbyte)

      {

  	/* Look for required version of multi-byte printing procset */

! 	if (!prt_find_resource("cidfont", &res_cidfont))

  	{

  	    EMSG(_("E456: Can't find PostScript resource file \"cidfont.ps\""));

  	    return FALSE;

  	}

! 	if (!prt_open_resource(&res_cidfont))

  	    return FALSE;

! 	if (!prt_check_resource(&res_cidfont, PRT_CID_PROLOG_VERSION))

  	    return FALSE;

      }

  #endif

--- 2957,2983 ----

  #endif

      /* Search for external resources VIM supplies */

!     if (!prt_find_resource("prolog", res_prolog))

      {

  	EMSG(_("E456: Can't find PostScript resource file \"prolog.ps\""));

  	return FALSE;

      }

!     if (!prt_open_resource(res_prolog))

  	return FALSE;

!     if (!prt_check_resource(res_prolog, PRT_PROLOG_VERSION))

  	return FALSE;

  #ifdef FEAT_MBYTE

      if (prt_out_mbyte)

      {

  	/* Look for required version of multi-byte printing procset */

! 	if (!prt_find_resource("cidfont", res_cidfont))

  	{

  	    EMSG(_("E456: Can't find PostScript resource file \"cidfont.ps\""));

  	    return FALSE;

  	}

! 	if (!prt_open_resource(res_cidfont))

  	    return FALSE;

! 	if (!prt_check_resource(res_cidfont, PRT_CID_PROLOG_VERSION))

  	    return FALSE;

      }

  #endif

***************

*** 2968,2974 ****

  #endif

  	p_encoding = enc_skip(p_penc);

  	if (*p_encoding == NUL

! 		|| !prt_find_resource((char *)p_encoding, &res_encoding))

  	{

  	    /* 'printencoding' not set or not supported - find alternate */

  #ifdef FEAT_MBYTE

--- 2993,2999 ----

  #endif

  	p_encoding = enc_skip(p_penc);

  	if (*p_encoding == NUL

! 		|| !prt_find_resource((char *)p_encoding, res_encoding))

  	{

  	    /* 'printencoding' not set or not supported - find alternate */

  #ifdef FEAT_MBYTE

***************

*** 2977,2989 ****

  	    p_encoding = enc_skip(p_enc);

  	    props = enc_canon_props(p_encoding);

  	    if (!(props & ENC_8BIT)

! 		    || !prt_find_resource((char *)p_encoding, &res_encoding))

  		/* 8-bit 'encoding' is not supported */

  #endif

  		{

  		/* Use latin1 as default printing encoding */

  		p_encoding = (char_u *)"latin1";

! 		if (!prt_find_resource((char *)p_encoding, &res_encoding))

  		{

  		    EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  			    p_encoding);

--- 3002,3014 ----

  	    p_encoding = enc_skip(p_enc);

  	    props = enc_canon_props(p_encoding);

  	    if (!(props & ENC_8BIT)

! 		    || !prt_find_resource((char *)p_encoding, res_encoding))

  		/* 8-bit 'encoding' is not supported */

  #endif

  		{

  		/* Use latin1 as default printing encoding */

  		p_encoding = (char_u *)"latin1";

! 		if (!prt_find_resource((char *)p_encoding, res_encoding))

  		{

  		    EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  			    p_encoding);

***************

*** 2991,2997 ****

  		}

  	    }

  	}

! 	if (!prt_open_resource(&res_encoding))

  	    return FALSE;

  	/* For the moment there are no checks on encoding resource files to

  	 * perform */

--- 3016,3022 ----

  		}

  	    }

  	}

! 	if (!prt_open_resource(res_encoding))

  	    return FALSE;

  	/* For the moment there are no checks on encoding resource files to

  	 * perform */

***************

*** 3005,3017 ****

  	if (prt_use_courier)

  	{

  	    /* Include ASCII range encoding vector */

! 	    if (!prt_find_resource(prt_ascii_encoding, &res_encoding))

  	    {

  		EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  							  prt_ascii_encoding);

  		return FALSE;

  	    }

! 	    if (!prt_open_resource(&res_encoding))

  		return FALSE;

  	    /* For the moment there are no checks on encoding resource files to

  	     * perform */

--- 3030,3042 ----

  	if (prt_use_courier)

  	{

  	    /* Include ASCII range encoding vector */

! 	    if (!prt_find_resource(prt_ascii_encoding, res_encoding))

  	    {

  		EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  							  prt_ascii_encoding);

  		return FALSE;

  	    }

! 	    if (!prt_open_resource(res_encoding))

  		return FALSE;

  	    /* For the moment there are no checks on encoding resource files to

  	     * perform */

***************

*** 3034,3077 ****

      if (prt_out_mbyte && prt_custom_cmap)

      {

  	/* Find user supplied CMap */

! 	if (!prt_find_resource(prt_cmap, &res_cmap))

  	{

  	    EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  								    prt_cmap);

  	    return FALSE;

  	}

! 	if (!prt_open_resource(&res_cmap))

  	    return FALSE;

      }

  #endif

      /* List resources supplied */

!     STRCPY(buffer, res_prolog.title);

      STRCAT(buffer, " ");

!     STRCAT(buffer, res_prolog.version);

      prt_dsc_resources("DocumentSuppliedResources", "procset", buffer);

  #ifdef FEAT_MBYTE

      if (prt_out_mbyte)

      {

! 	STRCPY(buffer, res_cidfont.title);

  	STRCAT(buffer, " ");

! 	STRCAT(buffer, res_cidfont.version);

  	prt_dsc_resources(NULL, "procset", buffer);

  	if (prt_custom_cmap)

  	{

! 	    STRCPY(buffer, res_cmap.title);

  	    STRCAT(buffer, " ");

! 	    STRCAT(buffer, res_cmap.version);

  	    prt_dsc_resources(NULL, "cmap", buffer);

  	}

      }

      if (!prt_out_mbyte || prt_use_courier)

  #endif

      {

! 	STRCPY(buffer, res_encoding.title);

  	STRCAT(buffer, " ");

! 	STRCAT(buffer, res_encoding.version);

  	prt_dsc_resources(NULL, "encoding", buffer);

      }

      prt_dsc_requirements(prt_duplex, prt_tumble, prt_collate,

--- 3059,3102 ----

      if (prt_out_mbyte && prt_custom_cmap)

      {

  	/* Find user supplied CMap */

! 	if (!prt_find_resource(prt_cmap, res_cmap))

  	{

  	    EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),

  								    prt_cmap);

  	    return FALSE;

  	}

! 	if (!prt_open_resource(res_cmap))

  	    return FALSE;

      }

  #endif

      /* List resources supplied */

!     STRCPY(buffer, res_prolog->title);

      STRCAT(buffer, " ");

!     STRCAT(buffer, res_prolog->version);

      prt_dsc_resources("DocumentSuppliedResources", "procset", buffer);

  #ifdef FEAT_MBYTE

      if (prt_out_mbyte)

      {

! 	STRCPY(buffer, res_cidfont->title);

  	STRCAT(buffer, " ");

! 	STRCAT(buffer, res_cidfont->version);

  	prt_dsc_resources(NULL, "procset", buffer);

  	if (prt_custom_cmap)

  	{

! 	    STRCPY(buffer, res_cmap->title);

  	    STRCAT(buffer, " ");

! 	    STRCAT(buffer, res_cmap->version);

  	    prt_dsc_resources(NULL, "cmap", buffer);

  	}

      }

      if (!prt_out_mbyte || prt_use_courier)

  #endif

      {

! 	STRCPY(buffer, res_encoding->title);

  	STRCAT(buffer, " ");

! 	STRCAT(buffer, res_encoding->version);

  	prt_dsc_resources(NULL, "encoding", buffer);

      }

      prt_dsc_requirements(prt_duplex, prt_tumble, prt_collate,

***************

*** 3114,3128 ****

      prt_dsc_noarg("BeginProlog");