Remove pstring from printing/*.c except for the

tdb_unpack requirement (I'll be making that an
allocating interface later).
Jeremy.
(This used to be commit d2ee75326ac291ab4f1860075ba35f58703c7d9d)

1 files changed, 77 insertions, 35 deletions

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index 8525d6208b7..cc4b744a11c 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -24,45 +24,63 @@ extern struct current_user current_user;
 extern userdom_struct current_user_info;
 
 /****************************************************************************
-run a given print command 
-a null terminated list of value/substitute pairs is provided
-for local substitution strings
+ Run a given print command
+ a null terminated list of value/substitute pairs is provided
+ for local substitution strings
 ****************************************************************************/
 static int print_run_command(int snum, const char* printername, bool do_sub,
 			     const char *command, int *outfd, ...)
 {
-	pstring syscmd;
+	char *syscmd;
 	char *arg;
 	int ret;
+	TALLOC_CTX *ctx = talloc_tos();
 	va_list ap;
 	va_start(ap, outfd);
 
 	/* check for a valid system printername and valid command to run */
 
-	if ( !printername || !*printername ) 
+	if ( !printername || !*printername ) {
 		return -1;
+	}
 
-	if (!command || !*command) 
+	if (!command || !*command) {
 		return -1;
+	}
 
-	pstrcpy(syscmd, command);
+	syscmd = talloc_strdup(ctx, command);
+	if (!syscmd) {
+		return -1;
+	}
 
 	while ((arg = va_arg(ap, char *))) {
 		char *value = va_arg(ap,char *);
-		pstring_sub(syscmd, arg, value);
+		syscmd = talloc_string_sub(ctx, syscmd, arg, value);
+		if (!syscmd) {
+			return -1;
+		}
 	}
 	va_end(ap);
-  
-	pstring_sub( syscmd, "%p", printername );
-
-	if ( do_sub && snum != -1 )
-		standard_sub_advanced(lp_servicename(snum),
-				      current_user_info.unix_name, "",
-				      current_user.ut.gid,
-				      get_current_username(),
-				      current_user_info.domain,
-				      syscmd, sizeof(syscmd));
-		
+
+	syscmd = talloc_string_sub(ctx, syscmd, "%p", printername);
+	if (!syscmd) {
+		return -1;
+	}
+
+	if (do_sub && snum != -1) {
+		syscmd = talloc_sub_advanced(ctx,
+				lp_servicename(snum),
+				current_user_info.unix_name,
+				"",
+				current_user.ut.gid,
+				get_current_username(),
+				current_user_info.domain,
+				syscmd);
+		if (!syscmd) {
+			return -1;
+		}
+	}
+
 	ret = smbrun_no_sanitize(syscmd,outfd);
 
 	DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret));
@@ -107,7 +125,7 @@ resume a job
 static int generic_job_resume(int snum, struct printjob *pjob)
 {
 	fstring jobstr;
-	
+
 	/* need to pause the spooled entry */
 	slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
 	return print_run_command(snum, PRINTERNAME(snum), True,
@@ -122,30 +140,52 @@ static int generic_job_resume(int snum, struct printjob *pjob)
 
 static int generic_job_submit(int snum, struct printjob *pjob)
 {
-	int ret;
-	pstring current_directory;
-	pstring print_directory;
-	char *wd, *p;
-	pstring jobname;
+	int ret = -1;
+	char *current_directory = NULL;
+	char *print_directory = NULL;
+	char *wd = NULL;
+	char *p = NULL;
+	char *jobname = NULL;
+	TALLOC_CTX *ctx = talloc_tos();
 	fstring job_page_count, job_size;
 
 	/* we print from the directory path to give the best chance of
            parsing the lpq output */
+	current_directory = TALLOC_ARRAY(ctx,
+					char,
+					PATH_MAX+1);
+	if (!current_directory) {
+		return -1;
+	}
 	wd = sys_getwd(current_directory);
-	if (!wd)
-		return 0;
+	if (!wd) {
+		return -1;
+	}
 
-	pstrcpy(print_directory, pjob->filename);
+	print_directory = talloc_strdup(ctx, pjob->filename);
+	if (!print_directory) {
+		return -1;
+	}
 	p = strrchr_m(print_directory,'/');
-	if (!p)
-		return 0;
+	if (!p) {
+		return -1;
+	}
 	*p++ = 0;
 
-	if (chdir(print_directory) != 0)
-		return 0;
+	if (chdir(print_directory) != 0) {
+		return -1;
+	}
 
-	pstrcpy(jobname, pjob->jobname);
-	pstring_sub(jobname, "'", "_");
+	jobname = talloc_strdup(ctx, pjob->jobname);
+	if (!jobname) {
+		ret = -1;
+		goto out;
+	}
+	jobname = talloc_string_sub(ctx, jobname, "'", "_");
+	if (!jobname) {
+		ret = -1;
+		goto out;
+	}
 	slprintf(job_page_count, sizeof(job_page_count)-1, "%d", pjob->page_count);
 	slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size);
 
@@ -159,8 +199,10 @@ static int generic_job_submit(int snum, struct printjob *pjob)
 			"%c", job_page_count,
 			NULL);
 
-	chdir(wd);
+ out:
 
+	chdir(wd);
+	TALLOC_FREE(current_directory);
         return ret;
 }