Update of /cvsroot/cpri/cpri/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30370/src
Modified Files:
drv_html.c printini.c printini.h spooler.c
Log Message:
Fixed bug 1411546 Nothing is printed
Index: printini.h
===================================================================
RCS file: /cvsroot/cpri/cpri/src/printini.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** printini.h 1 Mar 2003 10:27:26 -0000 1.1.1.1
--- printini.h 21 Jan 2006 15:11:48 -0000 1.2
***************
*** 3,7 ****
extern void _CpriSavePrinterSettings(void);
! char _cpri_spool_dir[MAXPATH];
#endif
--- 3,7 ----
extern void _CpriSavePrinterSettings(void);
! char *_cpri_spool_dir;
#endif
Index: printini.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/printini.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** printini.c 28 Mar 2003 18:53:01 -0000 1.4
--- printini.c 21 Jan 2006 15:11:48 -0000 1.5
***************
*** 3,17 ****
data from file and saving to file) */
- #include <string.h>
- #include <allegro.h>
- #include <cgui.h>
- #include <cgui/mem.h>
! #include "labldata.h"
#include "dialpri.h"
#include "spooler.h"
- #include "printini.h"
#include "cpri.h"
static char *print_section_name[] =
{ "Printer:LPT1", "Printer:LPT2", "Printer:LPT3", "Printer:DOS",
--- 3,19 ----
data from file and saving to file) */
! #include "printini.h"
#include "dialpri.h"
#include "spooler.h"
#include "cpri.h"
+ #include <cgui.h>
+ #include <cgui/mem.h>
+ #include <allegro.h>
+ #include "labldata.h"
+
+ #include <string.h>
+
static char *print_section_name[] =
{ "Printer:LPT1", "Printer:LPT2", "Printer:LPT3", "Printer:DOS",
***************
*** 23,27 ****
static char *pri_dbid_netcom2 = "Command-cont";
! char _cpri_spool_dir[MAXPATH];
static int printer_inited;
--- 25,29 ----
static char *pri_dbid_netcom2 = "Command-cont";
! char *_cpri_spool_dir;
static int printer_inited;
***************
*** 119,122 ****
--- 121,127 ----
}
_CpriDestroyBarIcon();
+ Release(_cpri_spool_dir);
+ printer_inited = 0;
+ _cpri_spool_dir = NULL;
}
***************
*** 136,145 ****
_CpriInitBarIcons();
printer_inited = 1;
! if (*_cpri_spool_dir == 0) {
tempdir = getenv("TEMP");
if (tempdir == NULL)
tempdir = getenv("TMP");
! if (tempdir && strlen(tempdir) < 255)
! strncpy(_cpri_spool_dir, tempdir, 255);
}
LoadPrinterSettings();
--- 141,168 ----
_CpriInitBarIcons();
printer_inited = 1;
! if (_cpri_spool_dir == NULL) {
tempdir = getenv("TEMP");
if (tempdir == NULL)
tempdir = getenv("TMP");
! if (tempdir == NULL) {
! #if (defined ALLEGRO_UNIX) || (defined ALLEGRO_MAC)
! if (exists("~/tmp")) {
! tempdir = "~/tmp";
! } else {
! tempdir = "./";
! }
! #elif (defied ALLEGRO_WINDOWS) || (defined ALLEGRO_DOS)
! if (exists("c:\\temp")) {
! tempdir = "c:\\temp";
! } else {
! tempdir = "";
! }
! #endif
! _cpri_spool_dir = GetMem(char, 2000);
! canonicalize_filename(_cpri_spool_dir, tempdir, 2000);
! _cpri_spool_dir = ResizeMem(char, _cpri_spool_dir, strlen(_cpri_spool_dir)+1);
! } else {
! _cpri_spool_dir = MkString(tempdir);
! }
}
LoadPrinterSettings();
Index: spooler.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/spooler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** spooler.c 21 Sep 2005 18:39:34 -0000 1.9
--- spooler.c 21 Jan 2006 15:11:48 -0000 1.10
***************
*** 2,15 ****
Contains the functions for background printing */
- #include <allegro.h>
- #include <string.h>
- #include <stdio.h>
-
- #include <cgui.h>
- #include <cgui/mem.h>
-
- #include "labldata.h"
#include "spooler.h"
! #include "cpri.h"
#include "dialpri.h"
#include "cpri.ht"
--- 2,7 ----
Contains the functions for background printing */
#include "spooler.h"
!
#include "dialpri.h"
#include "cpri.ht"
***************
*** 21,24 ****
--- 13,24 ----
#include "printini.h"
+ #include <cgui.h>
+ #include <cgui/mem.h>
+ #include <allegro.h>
+ #include <string.h>
+ #include <stdio.h>
+
+ #include "labldata.h"
+
#define IdleQ(q) (_CpriEmptyQ(q) && !(q)->hold)
//#define silent_test
***************
*** 103,108 ****
s = GetMem(char, strlen(_cpri_spool_dir) + strlen(spoolname) + 2);
! sprintf(s, "%s/%s", _cpri_spool_dir, spoolname);
! fix_filename_slashes(s);
return s;
}
--- 103,112 ----
s = GetMem(char, strlen(_cpri_spool_dir) + strlen(spoolname) + 2);
! if (*_cpri_spool_dir) {
! sprintf(s, "%s%c%s", _cpri_spool_dir, OTHER_PATH_SEPARATOR, spoolname);
! fix_filename_slashes(s);
! } else {
! sprintf(s, "%s", spoolname);
! }
return s;
}
***************
*** 628,632 ****
tmpfil = GetMem(char, strlen(_cpri_spool_dir)+50);
! sprintf(tmpfil, "%s\\%d.net", _cpri_spool_dir, net_cnt++);
netspoolfile = fopen(tmpfil, "w");
ptxt = LoadCompiledTexts(cpri_labels, "dialpri", &nr);
--- 632,636 ----
tmpfil = GetMem(char, strlen(_cpri_spool_dir)+50);
! sprintf(tmpfil, "%s%c%d.net", _cpri_spool_dir, OTHER_PATH_SEPARATOR, net_cnt++);
netspoolfile = fopen(tmpfil, "w");
ptxt = LoadCompiledTexts(cpri_labels, "dialpri", &nr);
Index: drv_html.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/drv_html.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** drv_html.c 22 Jan 2005 18:18:57 -0000 1.7
--- drv_html.c 21 Jan 2006 15:11:48 -0000 1.8
***************
*** 2,20 ****
Contains the print-driver for creating html-files */
- #include <string.h>
- #include <allegro.h>
-
- #include <cgui.h>
- #include <cgui/mem.h>
-
- #include "spooler.h"
#include "drv_html.h"
#include "cpri.h"
#include "pridrive.h"
#include "drv_common.h"
- #include "labldata.h"
#include "dialpri.h"
#include "cpri.ht"
#define MAXLINKLEN 10000
--- 2,19 ----
Contains the print-driver for creating html-files */
#include "drv_html.h"
+ #include "spooler.h"
#include "cpri.h"
#include "pridrive.h"
#include "drv_common.h"
#include "dialpri.h"
#include "cpri.ht"
+ #include <cgui.h>
+ #include <cgui/mem.h>
+ #include <allegro.h>
+ #include <string.h>
+ #include "labldata.h"
+
#define MAXLINKLEN 10000
|