split fsp specific routines out of printing.c to fix linking problem

in TNG
(This used to be commit 82df25b28b94b0041676fb433e0e677acb544579)

diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c
new file mode 100644 (file)
index 0000000..72cd006
--- /dev/null
+++ b/source3/printing/printfsp.c
@@ -0,0 +1,91 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 3.0
+   printing backend routines for smbd - using files_struct rather
+   than only snum
+   Copyright (C) Andrew Tridgell 1992-2000
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+extern int DEBUGLEVEL;
+
+
+/***************************************************************************
+open a print file and setup a fsp for it. This is a wrapper around
+print_job_start().
+***************************************************************************/
+
+files_struct *print_fsp_open(connection_struct *conn,char *jobname)
+{
+       int jobid;
+       SMB_STRUCT_STAT sbuf;
+       extern struct current_user current_user;
+       files_struct *fsp = file_new();
+
+       if(!fsp)
+               return NULL;
+
+       jobid = print_job_start(SNUM(conn), jobname);
+       if (jobid == -1) {
+               file_free(fsp);
+               return NULL;
+       }
+
+       /* setup a full fsp */
+       fsp->print_jobid = jobid;
+       fsp->fd = print_job_fd(jobid);
+       conn->vfs_ops.fstat(fsp->fd, &sbuf);
+       fsp->mode = sbuf.st_mode;
+       fsp->inode = sbuf.st_ino;
+       fsp->dev = sbuf.st_dev;
+       GetTimeOfDay(&fsp->open_time);
+       fsp->vuid = current_user.vuid;
+       fsp->size = 0;
+       fsp->pos = -1;
+       fsp->open = True;
+       fsp->can_lock = True;
+       fsp->can_read = False;
+       fsp->can_write = True;
+       fsp->share_mode = 0;
+       fsp->print_file = True;
+       fsp->modified = False;
+       fsp->oplock_type = NO_OPLOCK;
+       fsp->sent_oplock_break = NO_BREAK_SENT;
+       fsp->is_directory = False;
+       fsp->stat_open = False;
+       fsp->directory_delete_on_close = False;
+       fsp->conn = conn;
+       string_set(&fsp->fsp_name,print_job_fname(jobid));
+       fsp->wbmpx_ptr = NULL;      
+       fsp->wcp = NULL; 
+
+       conn->num_files_open++;
+
+       return fsp;
+}
+
+/****************************************************************************
+print a file - called on closing the file
+****************************************************************************/
+void print_fsp_end(files_struct *fsp)
+{
+       print_job_end(fsp->print_jobid);
+
+       if (fsp->fsp_name) {
+               string_free(&fsp->fsp_name);
+       }
+}

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 58f284b4fc704d4604e6a904f0dd9e815ea0299d..6e9482ad4ec3cf691bce0ea46c800ed4b8e091c3 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -852,68 +852,3 @@ BOOL print_queue_purge(int snum)
 }
 
 
-/***************************************************************************
-open a print file and setup a fsp for it. This is a wrapper around
-print_job_start().
-***************************************************************************/
-
-files_struct *print_fsp_open(connection_struct *conn,char *jobname)
-{
-       int jobid;
-       SMB_STRUCT_STAT sbuf;
-       extern struct current_user current_user;
-       files_struct *fsp = file_new();
-
-       if(!fsp)
-               return NULL;
-
-       jobid = print_job_start(SNUM(conn), jobname);
-       if (jobid == -1) {
-               file_free(fsp);
-               return NULL;
-       }
-
-       /* setup a full fsp */
-       fsp->print_jobid = jobid;
-       fsp->fd = print_job_fd(jobid);
-       conn->vfs_ops.fstat(fsp->fd, &sbuf);
-       fsp->mode = sbuf.st_mode;
-       fsp->inode = sbuf.st_ino;
-       fsp->dev = sbuf.st_dev;
-       GetTimeOfDay(&fsp->open_time);
-       fsp->vuid = current_user.vuid;
-       fsp->size = 0;
-       fsp->pos = -1;
-       fsp->open = True;
-       fsp->can_lock = True;
-       fsp->can_read = False;
-       fsp->can_write = True;
-       fsp->share_mode = 0;
-       fsp->print_file = True;
-       fsp->modified = False;
-       fsp->oplock_type = NO_OPLOCK;
-       fsp->sent_oplock_break = NO_BREAK_SENT;
-       fsp->is_directory = False;
-       fsp->stat_open = False;
-       fsp->directory_delete_on_close = False;
-       fsp->conn = conn;
-       string_set(&fsp->fsp_name,print_job_fname(jobid));
-       fsp->wbmpx_ptr = NULL;      
-       fsp->wcp = NULL; 
-
-       conn->num_files_open++;
-
-       return fsp;
-}
-
-/****************************************************************************
-print a file - called on closing the file
-****************************************************************************/
-void print_fsp_end(files_struct *fsp)
-{
-       print_job_end(fsp->print_jobid);
-
-       if (fsp->fsp_name) {
-               string_free(&fsp->fsp_name);
-       }
-}