mars_nwe/ncpfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Import ncpfs 2.2.4

Browse Source
This commit is contained in:
ncpfs archive import
2026-04-28 20:40:00 +02:00
parent f6ac693f98
commit ef8405088b
51 changed files with 31221 additions and 9147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util/Makefile.in
View File

@@ -19,10 +19,10 @@ LIBS = @INTLLIBS@ @LIBS@
O_OTHER = dsqueue.o
O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \
nwpasswd.o nwbols.o nwbocreate.o nwborm.o nwboprops.o \
pqstat.o pqrm.o nwbpcreate.o nwbprm.o nwbpvalues.o nwbpadd.o \
pqstat.o nwpqjob.o nwbpcreate.o nwbprm.o nwbpvalues.o nwbpadd.o \
nwbpset.o nwgrant.o nwrevoke.o nwuserlist.o nwauth.o \
nwfstime.o nwvolinfo.o nwtrustee.o nwdir.o \
nwfsctrl.o
nwfsctrl.o nwpjmv.o
O_SBINUTILS =
ifeq ($(USE_KERNEL),1)
O_USERUTILS += ncopy.o nwtrustee2.o nwpurge.o nwrights.o
@@ -47,10 +47,10 @@ NCPLIB_DIR = ../lib
LIBDEP = $(NCPLIB_DIR)/$(NCP_LIB)
endif
CFLAGS_ncopy.o = -D_GNU_SOURCE
ADDOBJS_pqstat = dsqueue.o
ADDOBJS_pqrm = dsqueue.o
ADDOBJS_nprint = dsqueue.o
CFLAGS_ncopy.o = -D_GNU_SOURCE
ADDOBJS_pqstat = dsqueue.o
ADDOBJS_nwpqjob = dsqueue.o
ADDOBJS_nprint = dsqueue.o
.PHONY : all install install-dev dep clean mrproper distclean
.PHONY : default
@@ -63,6 +63,7 @@ all: $(UTILS) ncptest # ipx_probe
install: all
${INSTALL} -d $(DESTDIR)$(bindir)
${INSTALL} $(USERUTILS) $(DESTDIR)$(bindir)
ln -sf nwpqjob $(DESTDIR)$(bindir)/pqrm
ifneq ($(SBINUTILS),)
${INSTALL} -d $(DESTDIR)$(sbindir)
${INSTALL} $(SBINUTILS) $(DESTDIR)$(sbindir)
@@ -90,7 +91,7 @@ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c
[ -s $@ ] || rm -f $@
pqstat pqrm nprint: dsqueue.o
pqstat nwpqjob nprint: dsqueue.o
$(UTILS): %: %.o $(LIBDEP)
$(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS}

16
util/nprint.c
View File

@@ -267,22 +267,25 @@ main(int argc, char *argv[])
NWObjectID id;
if (try_nds_queue(&conn, queue, &id)) {
printf(_("could not find queue %s\n"), queue);
printf(_("Could not find queue %s\n"), queue);
ncp_close(conn);
exit(1);
}
q.object_id = id;
}
if (ncp_create_queue_job_and_file(conn, q.object_id, &j) != 0)
err = ncp_create_queue_job_and_file(conn, q.object_id, &j);
if (err)
{
printf(_("create error\n"));
printf(_("Cannot create print job: %s\n"), strnwerror(err));
ncp_close(conn);
exit(1);
}
written = 0;
do
{
read_this_time = read(file, buf, sizeof(buf));
do {
read_this_time = read(file, buf, sizeof(buf));
} while (read_this_time == -1 && errno == EINTR);
if (read_this_time < 0)
{
break;
@@ -298,9 +301,10 @@ main(int argc, char *argv[])
close(file);
if (ncp_close_file_and_start_job(conn, q.object_id, &j) != 0)
err = ncp_close_file_and_start_job(conn, q.object_id, &j);
if (err)
{
printf(_("close error\n"));
printf(_("Cannot start print job: %s\n"), strnwerror(err));
ncp_close(conn);
exit(1);
}

421
util/nwpjmv.c Normal file
View File

@@ -0,0 +1,421 @@
/*
nwjpmv.c
Copyright (C) 2003 by Bruno Browning
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Revision history:
0.00 1996 Volker Lendecke
Initial revision (as pserver.c)
2003 Bruno Browning
nwpjmv.c
*/
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <syslog.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <signal.h>
#include <string.h>
#include <ncp/ncplib.h>
#include "private/libintl.h"
#define _(X) gettext(X)
struct nw_queue
{
struct ncp_conn *conn;
char queue_name[NCP_BINDERY_NAME_LEN];
u_int32_t queue_id;
u_int16_t job_type;
char *command;
};
static volatile int term_request;
static char *progname;
static void
usage(void)
{
fprintf(stderr, _("usage: %s [options] file\n"), progname);
}
static void
help(void)
{
printf(_("\n"
"usage: %s [options]\n"), progname);
printf(_("\n"
"-S server Server name to be used\n"
"-U username Print Server name sent to server\n"
"-P password Use this password\n"
"-n Do not use any password\n"
"-C Don't convert password to uppercase\n"
"-q queue name Name of the printing queue to use\n"
"-c command Name of print command, default: 'lpr'\n"
"-j job number ID number of job to service\n"
"-d Debug"
"\n"));
}
#ifndef NCP_BINDERY_PSERVER
#define NCP_BINDERY_PSERVER (0x0007)
#endif
static void
terminate_handler(int dummy __attribute__((unused)))
{
signal(SIGTERM, terminate_handler);
signal(SIGINT, terminate_handler);
term_request = 1;
}
static int
init_queue(struct ncp_conn *conn, char *queue_name, char *command,
struct nw_queue *q)
{
struct ncp_bindery_object obj;
long err;
str_upper(queue_name);
q->conn = conn;
q->command = command;
err = ncp_get_bindery_object_id(conn, NCP_BINDERY_PQUEUE,
queue_name, &obj);
if (err) {
fprintf(stderr, _("Queue %s not found: %s\n"),
queue_name, strnwerror(err));
return -1;
}
q->queue_id = obj.object_id;
memcpy(q->queue_name, obj.object_name, sizeof(q->queue_name));
err = ncp_attach_to_queue(conn, q->queue_id);
if (err) {
fprintf(stderr, _("Could not attach to queue %s: %s\n"),
queue_name, strnwerror(err));
return -1;
}
return 0;
}
static void
build_command(struct nw_queue *q, struct queue_job *j,
char *target, int target_size, char *user)
{
char *s = q->command;
char *target_end = target + target_size;
static void add_string(const char *str)
{
int len = strlen(str);
if (target + len + 1 > target_end)
{
len = target_end - target - 1;
}
strncpy(target, str, len);
target += len;
}
memset(target, 0, target_size);
while ((*s != 0) && (target < target_end))
{
if (*s != '%')
{
*target = *s;
target += 1;
s += 1;
continue;
}
switch (*(s + 1))
{
case '%':
*target = '%';
target += 1;
break;
case 'u':
add_string(user);
break;
case 'd':
if (j->j.JobTextDescription[0])
add_string(j->j.JobTextDescription);
else
add_string(_("No Description"));
break;
default:
*target = '%';
*(target + 1) = *(s + 1);
target += 2;
}
s += 2;
}
}
static int
move_job(struct nw_queue *q, u_int32_t jobID)
{
struct queue_job job;
int fd[2];
int pid;
int retcode;
struct ncp_bindery_object u;
char user[50];
retcode = ncp_change_job_position(q->conn, q->queue_id, jobID, 1);
if (retcode != 0) {
syslog(LOG_ERR, _("Failed to change job position: %s\n"), strnwerror(retcode));
return -1;
}
retcode = ncp_service_queue_job(q->conn, q->queue_id, q->job_type, &job);
if (retcode != 0) {
if (retcode == NWE_Q_NO_JOB || retcode == NWE_SERVER_FAILURE) {
/* No job for us */
return 0;
}
syslog(LOG_ERR, _("Cannot service print job: %s\n"), strnwerror(retcode));
return 2;
}
if (ncp_get_queue_job_info(q->conn, q->queue_id, job.j.JobNumber, &job.j) != 0)
{
job.j.JobTextDescription[0]=0;
}
if (job.j.JobNumber != jobID) {
syslog(LOG_ERR, _("wrong job queued: expected %08X, got %08X\n"), jobID, job.j.JobNumber);
goto fail;
}
if ((retcode=ncp_get_bindery_object_name
(q->conn, htonl(job.j.ClientObjectID), &u))
== 0)
{
memcpy(user,u.object_name,48);
user[48]=0;
}
else
{
sprintf(user,_("<Unknown>"));
}
if (pipe(fd) < 0)
{
syslog(LOG_ERR, _("pipe error: %m"));
goto fail;
}
if ((pid = fork()) < 0)
{
syslog(LOG_ERR, _("fork error: %m"));
goto fail;
}
if (pid > 0)
{
/* parent */
char buf[1024];
size_t result;
off_t offset = 0;
close(fd[0]); /* close read end */
while ((result = ncp_read(q->conn, job.file_handle, offset,
sizeof(buf), buf)) > 0)
{
offset += result;
if (write(fd[1], buf, result) != result)
{
goto fail;
}
}
close(fd[1]); /* and close write end */
if (waitpid(pid, NULL, 0) < 0)
{
syslog(LOG_ERR, _("waitpid: %m\n"));
}
} else
{
/* child */
char command[2048];
close(fd[1]); /* close write end */
if (fd[0] != STDIN_FILENO)
{
if (dup2(fd[0], STDIN_FILENO) != STDIN_FILENO)
{
syslog(LOG_ERR, _("dup2 error: %m\n"));
close(fd[0]);
exit(1);
}
close(fd[0]);
}
build_command(q, &job, command, sizeof(command), user);
execl("/bin/sh", "sh", "-c", command, NULL);
syslog(LOG_ERR, _("exec error: %m\n"));
close(fd[0]);
exit(1);
}
ncp_finish_servicing_job(q->conn, q->queue_id, job.j.JobNumber, 0);
return 1;
fail:
ncp_abort_servicing_job(q->conn, q->queue_id, job.j.JobNumber);
/* We tell that we did not have a job to avoid overloading
when something's wrong */
return 0;
}
static struct nw_queue q;
int
main(int argc, char *argv[])
{
struct ncp_conn *conn;
int opt;
int debug = 0;
int i;
long err;
char *queue_name = NULL;
char *job_num = NULL;
char *end;
u_int32_t jobID;
char default_command[] = "lpr";
char *command = default_command;
setlocale(LC_ALL, "");
bindtextdomain(NCPFS_PACKAGE, LOCALEDIR);
textdomain(NCPFS_PACKAGE);
progname = argv[0];
for (i = 1; i < argc; i += 1)
{
if ((strcmp(argv[i], "-h") == 0)
|| (strcmp(argv[i], "-?") == 0))
{
help();
exit(0);
}
}
for (i = 1; i < argc; i += 1)
{
if (strcmp(argv[i], "-d") == 0)
{
debug = 1;
break;
}
}
if (debug == 0)
{
openlog("nwpjmv", LOG_PID, LOG_LPR);
}
if ((conn = ncp_initialize_as(&argc, argv, 1,
NCP_BINDERY_PSERVER, &err)) == NULL)
{
com_err(argv[0], err, _("when initializing"));
return 1;
}
while ((opt = getopt(argc, argv, "q:c:j:dh")) != EOF)
{
switch (opt)
{
case 'q':
queue_name = optarg;
break;
case 'c':
command = optarg;
break;
case 'j':
job_num = optarg;
break;
case 'd':
debug = 1;
break;
case 'h':
break;
default:
usage();
return -1;
}
}
if (argc != optind)
{
usage();
return -1;
}
memset(&q, 0, sizeof(q));
if (queue_name == NULL)
{
fprintf(stderr, _("You must specify a queue\n"));
return 1;
}
if (init_queue(conn, queue_name, command, &q) != 0)
{
ncp_close(conn);
return 1;
}
term_request = 0;
signal(SIGTERM, terminate_handler);
signal(SIGINT, terminate_handler);
jobID = strtoul(job_num, &end, 16);
if (*end) {
fprintf(stderr, _("Cannot parse \"%s\" - jobID must be hexadecimal number\n"), argv[i]);
} else {
int err2;
err2 = move_job(&q, jobID);
if (err2 != 1) {
fprintf(stderr, _("Could not move job %08X\n"), jobID);
}
}
ncp_detach_from_queue(conn, q.queue_id);
ncp_close(conn);
return 0;
}

93
util/pqrm.c → util/nwpqjob.c
View File

@@ -35,6 +35,7 @@
#include <unistd.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <ncp/nwcalls.h>
#include "dsqueue.h"
@@ -42,13 +43,40 @@
#include "private/libintl.h"
#define _(X) gettext(X)
static const char* progname;
static int isPQRM = 0;
static void usage(void) {
fprintf(stderr, _("\n"));
fprintf(stderr, _("usage: %s [options] <queue> <jobID> [<jobID> ...]\n"), progname);
fprintf(stderr, _("\n"));
fprintf(stderr, _("-S server Server name to be used\n"));
fprintf(stderr, _("-U username User name\n"));
fprintf(stderr, _("-P password Use this password\n"));
fprintf(stderr, _("-n Do not use any password\n"));
fprintf(stderr, _("-d Delete job from queue (default for pqrm)\n"));
fprintf(stderr, _("-r Resume job\n"));
fprintf(stderr, _("\n"));
}
int
main(int argc, char **argv)
{
struct ncp_conn *conn;
struct ncp_bindery_object q;
long err;
int i;
enum { C_UNK, C_DEL, C_RESUME } action = C_UNK;
const char* pgm;
int opt;
progname = argv[0];
pgm = strrchr(progname, '/');
if (pgm) {
progname = pgm + 1;
}
if (!strcmp(progname, "pqrm")) {
isPQRM = 1;
}
setlocale(LC_ALL, "");
bindtextdomain(NCPFS_PACKAGE, LOCALEDIR);
@@ -56,23 +84,45 @@ main(int argc, char **argv)
if ((conn = ncp_initialize(&argc, argv, 1, &err)) == NULL)
{
com_err(argv[0], err, _("when initializing"));
com_err(progname, err, _("when initializing"));
return 1;
}
if (argc < 3)
{
fprintf(stderr, _("usage: %s <queue> <jobID> [<jobID> ...]\n"), argv[0]);
while ((opt = getopt(argc, argv, "rd")) != -1) {
switch (opt) {
case 'd':
action = C_DEL;
break;
case 'r':
action = C_RESUME;
break;
default:
ncp_close(conn);
usage();
return 1;
}
}
if (action == C_UNK) {
if (isPQRM) {
action = C_DEL;
} else {
ncp_close(conn);
fprintf(stderr, _("%s: At least one of -d or -r must be specified\n"), progname);
return 2;
}
}
if (optind + 2 > argc) {
ncp_close(conn);
usage();
return 1;
}
if (ncp_get_bindery_object_id(conn, NCP_BINDERY_PQUEUE,
argv[1], &q) != 0)
argv[optind], &q) != 0)
{
NWObjectID id;
if (try_nds_queue(&conn, argv[1], &id)) {
if (try_nds_queue(&conn, argv[optind], &id)) {
char server[NW_MAX_SERVER_NAME_LEN];
const char* sptr = server;
NWCCODE err2;
@@ -83,27 +133,38 @@ main(int argc, char **argv)
sptr = "?";
printf(_("Queue \"%s\" on server %s not found.\n"),
argv[1], sptr);
argv[optind], sptr);
ncp_close(conn);
exit(1);
}
q.object_id = id;
}
optind++;
for (i=2; i<argc; i++) {
for (; optind < argc; optind++) {
u_int32_t jobID;
char* end;
jobID = strtoul(argv[i], &end, 16);
jobID = strtoul(argv[optind], &end, 16);
if (*end) {
fprintf(stderr, _("Cannot parse \"%s\" - jobID must be hexadecimal number\n"), argv[i]);
fprintf(stderr, _("Cannot parse \"%s\" - jobID must be hexadecimal number\n"), argv[optind]);
} else {
int err2;
NWCCODE err2;
err2 = NWRemoveJobFromQueue2(conn, q.object_id, jobID);
if (err2 == 0x89D5) {
if (action == C_RESUME) {
struct nw_queue_job_entry j;
err2 = ncp_get_queue_job_info(conn, q.object_id, jobID, &j);
if (!err2) {
j.JobControlFlags &= ~(QJE_OPER_HOLD | QJE_USER_HOLD);
err2 = NWChangeQueueJobEntry(conn, q.object_id, &j);
}
} else {
err2 = NWRemoveJobFromQueue2(conn, q.object_id, jobID);
}
if (err2 == NWE_Q_NO_JOB) {
fprintf(stderr, _("Job %08X does not exist\n"), jobID);
} else if (err2 == 0x89D6) {
} else if (err2 == NWE_Q_NO_JOB_RIGHTS) {
fprintf(stderr, _("You have not rights to cancel job %08X\n"), jobID);
} else if (err2) {
fprintf(stderr, _("Cannot cancel job %08X: %s\n"), jobID, strnwerror(err2));

63
util/pqstat.c
View File

@@ -27,6 +27,9 @@
1.01 2001, February 18 Petr Vandrovec <vandrove@vc.cvut.cz>
Added support for NDS queues.
1.02 2003 March 24 Bruno Browning <bruno@lss.wisc.edu>
Added -B switch to show bannername instead of username
*/
@@ -104,48 +107,70 @@ static void get_object_name(NWCONN_HANDLE conn, NWObjectID objID, char* buff) {
}
}
static const char *progname;
static void usage(void) {
fprintf(stderr, _("usage: %s [-B] <queue> [<qlen>]\n"), progname);
}
int
main(int argc, char **argv)
{
struct ncp_conn *conn;
struct ncp_bindery_object q;
unsigned long maxqlen=~0;
const char *queueName;
long err;
int useBanner = 0;
int opt;
u_int32_t qlen, idl1,idl2, job_id;
struct nw_queue_job_entry j;
progname = argv[0];
setlocale(LC_ALL, "");
bindtextdomain(NCPFS_PACKAGE, LOCALEDIR);
textdomain(NCPFS_PACKAGE);
if ((conn = ncp_initialize(&argc, argv, 1, &err)) == NULL)
{
com_err(argv[0], err, _("when initializing"));
com_err(progname, err, _("when initializing"));
return 1;
}
if (argc == 3) {
while ((opt = getopt(argc, argv, "B")) != -1) {
switch (opt) {
case 'B':
useBanner = 1;
break;
default:
usage();
return 1;
}
}
if (optind >= argc || optind + 2 < argc)
{
usage();
return 1;
}
queueName = argv[optind++];
if (optind < argc) {
char *end;
maxqlen=strtoul(argv[2], &end, 10);
if (*end != 0)
argc = 4;
maxqlen=strtoul(argv[optind++], &end, 10);
if (*end != 0) {
usage();
return 1;
}
}
if (argc < 2 || argc > 3)
{
fprintf(stderr, _("usage: %s <queue> [<qlen>]\n"), argv[0]);
return 1;
}
if (ncp_get_bindery_object_id(conn, NCP_BINDERY_PQUEUE,
argv[1], &q) != 0)
queueName, &q) != 0)
{
NWObjectID id;
if (try_nds_queue(&conn, argv[1], &id)) {
if (try_nds_queue(&conn, queueName, &id)) {
char server[NW_MAX_SERVER_NAME_LEN];
const char* sptr = server;
NWCCODE err2;
@@ -155,7 +180,7 @@ main(int argc, char **argv)
if (err2)
sptr = "?";
printf(_("Queue \"%s\" on server %s not found.\n"),
argv[1], server);
queueName, server);
ncp_close(conn);
exit(1);
}
@@ -190,7 +215,7 @@ main(int argc, char **argv)
if (err == NWE_Q_NO_RIGHTS) {
fprintf(stderr, _("You have insufficient rights to list queue jobs\n"));
} else {
com_err(argv[0], err, _(": cannot get queue length"));
com_err(progname, err, _(": cannot get queue length"));
}
ncp_close(conn);
exit(1);
@@ -215,7 +240,11 @@ main(int argc, char **argv)
const char* jst;
char user[MAX_DN_BYTES];
get_object_name(conn, ntohl(j.ClientObjectID), user);
if (useBanner) {
memcpy(user, &j.ClientRecordArea[32], 13);
} else {
get_object_name(conn, ntohl(j.ClientObjectID), user);
}
j.JobFileName[j.FileNameLen]=0;