Mercurial > illumos > illumos-gate
diff usr/src/cmd/fs.d/smbclnt/smbutil/print.c @ 13394:96340372b72d
1120 Use real file descriptors for smbfs named pipes.
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
| author | Gordon Ross <gwr@nexenta.com> |
|---|---|
| date | Thu, 30 Jun 2011 17:58:05 -0400 |
| parents | 71bf38dba3d6 |
| children |
line wrap: on
line diff
--- a/usr/src/cmd/fs.d/smbclnt/smbutil/print.c Fri Jun 24 08:44:32 2011 -0700 +++ b/usr/src/cmd/fs.d/smbclnt/smbutil/print.c Thu Jun 30 17:58:05 2011 -0400 @@ -33,6 +33,7 @@ */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -150,7 +151,7 @@ * Have the printer share connection. * Print the file. */ - snprintf(titlebuf, sizeof (titlebuf), "%s_%s", + snprintf(titlebuf, sizeof (titlebuf), "%s %s", ctx->ct_user, filename); error = print_file(ctx, titlebuf, file); @@ -185,13 +186,15 @@ print_file(smb_ctx_t *ctx, char *title, int file) { off_t offset; - int error, rcnt, wcnt; + int rcnt, wcnt; int setup_len = 0; /* No printer setup data */ int mode = MODE_GRAPHICS; /* treat as raw data */ - int fh = -1; + int error = 0; + int pfd = -1; - error = smb_printer_open(ctx, setup_len, mode, title, &fh); - if (error) { + pfd = smb_open_printer(ctx, title, setup_len, mode); + if (pfd < 0) { + error = errno; smb_error("could not open print job", error); return (error); } @@ -207,7 +210,7 @@ if (rcnt == 0) break; - wcnt = smb_fh_write(ctx, fh, offset, rcnt, databuf); + wcnt = smb_fh_write(pfd, offset, rcnt, databuf); if (wcnt < 0) { error = errno; smb_error("error writing spool file\n", error); @@ -221,6 +224,6 @@ offset += wcnt; } - (void) smb_printer_close(ctx, fh); + (void) smb_fh_close(pfd); return (error); }