Menu
▾
▴
[Npfs-svn] SF.net SVN: npfs:[35] npfs/trunk/libnpclient/examples
|
From: <ab...@us...> - 2009-06-03 21:04:25
|
Revision: 35
http://npfs.svn.sourceforge.net/npfs/?rev=35&view=rev
Author: abbyz9
Date: 2009-06-03 21:04:16 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Fix npclient examples.
Modified Paths:
--------------
npfs/trunk/libnpclient/examples/9ls.c
npfs/trunk/libnpclient/examples/9read.c
npfs/trunk/libnpclient/examples/9write.c
Modified: npfs/trunk/libnpclient/examples/9ls.c
===================================================================
--- npfs/trunk/libnpclient/examples/9ls.c 2009-06-03 20:57:45 UTC (rev 34)
+++ npfs/trunk/libnpclient/examples/9ls.c 2009-06-03 21:04:16 UTC (rev 35)
@@ -48,27 +48,24 @@
int
main(int argc, char **argv)
{
- int sfd, i, n;
+ int i, n;
int c, port;
char *addr, *s;
- char *uname, *path;
+ char *path;
Npuser *user;
Npcfsys *fs;
Npcfid *fid;
- struct sockaddr_in saddr;
- struct hostent *hostinfo;
Npwstat *stat;
port = 564;
// npc_chatty = 1;
- user = np_uid2user(geteuid());
+ user = np_unix_users->uid2user(np_unix_users, geteuid());
if (!user) {
fprintf(stderr, "cannot retrieve user %d\n", geteuid());
exit(1);
}
- uname = user->uname;
while ((c = getopt(argc, argv, "dp:")) != -1) {
switch (c) {
case 'd':
@@ -82,7 +79,7 @@
break;
case 'u':
- uname = optarg;
+ user = np_unix_users->uname2user(np_unix_users, optarg);
break;
default:
@@ -98,29 +95,8 @@
addr = argv[optind];
path = argv[optind+1];
- sfd = socket(PF_INET, SOCK_STREAM, 0);
- if (sfd < 0) {
- perror("socket");
- exit(1);
- }
+ fs = npc_netmount(npc_netaddr(addr, port), user, port, NULL, NULL);
- hostinfo = gethostbyname (addr);
- if (!hostinfo) {
- perror("gethostbyname");
- exit(1);
- }
-
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(port);
- saddr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
-
- if (connect(sfd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
- perror("connect");
- exit(1);
- }
-
- fs = npc_mount(sfd, NULL, "lucho");
-
fid = npc_open(fs, path, Oread);
if (!fid) {
fprintf(stderr, "error\n");
Modified: npfs/trunk/libnpclient/examples/9read.c
===================================================================
--- npfs/trunk/libnpclient/examples/9read.c 2009-06-03 20:57:45 UTC (rev 34)
+++ npfs/trunk/libnpclient/examples/9read.c 2009-06-03 21:04:16 UTC (rev 35)
@@ -48,27 +48,24 @@
int
main(int argc, char **argv)
{
- int sfd, i, n, off;
+ int i, n, off;
int c, port;
char *addr, *s;
- char *uname, *path;
+ char *path;
Npuser *user;
Npcfsys *fs;
Npcfid *fid;
- struct sockaddr_in saddr;
- struct hostent *hostinfo;
char buf[512];
port = 564;
// npc_chatty = 1;
- user = np_uid2user(geteuid());
+ user = np_unix_users->uid2user(np_unix_users, geteuid());
if (!user) {
fprintf(stderr, "cannot retrieve user %d\n", geteuid());
exit(1);
}
- uname = user->uname;
while ((c = getopt(argc, argv, "dp:")) != -1) {
switch (c) {
case 'd':
@@ -82,7 +79,7 @@
break;
case 'u':
- uname = optarg;
+ user = np_unix_users->uname2user(np_unix_users, optarg);
break;
default:
@@ -98,29 +95,8 @@
addr = argv[optind];
path = argv[optind+1];
- sfd = socket(PF_INET, SOCK_STREAM, 0);
- if (sfd < 0) {
- perror("socket");
- exit(1);
- }
+ fs = npc_netmount(npc_netaddr(addr, port), user, port, NULL, NULL);
- hostinfo = gethostbyname (addr);
- if (!hostinfo) {
- perror("gethostbyname");
- exit(1);
- }
-
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(port);
- saddr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
-
- if (connect(sfd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
- perror("connect");
- exit(1);
- }
-
- fs = npc_mount(sfd, NULL, "lucho");
-
fid = npc_open(fs, path, Oread);
if (!fid) {
fprintf(stderr, "cannot open\n");
Modified: npfs/trunk/libnpclient/examples/9write.c
===================================================================
--- npfs/trunk/libnpclient/examples/9write.c 2009-06-03 20:57:45 UTC (rev 34)
+++ npfs/trunk/libnpclient/examples/9write.c 2009-06-03 21:04:16 UTC (rev 35)
@@ -48,27 +48,24 @@
int
main(int argc, char **argv)
{
- int sfd, i, n, off;
+ int i, n, off;
int c, port;
char *addr, *s;
- char *uname, *path;
+ char *path;
Npuser *user;
Npcfsys *fs;
Npcfid *fid;
- struct sockaddr_in saddr;
- struct hostent *hostinfo;
char buf[512];
port = 564;
// npc_chatty = 1;
- user = np_uid2user(geteuid());
+ user = np_unix_users->uid2user(np_unix_users, geteuid());
if (!user) {
fprintf(stderr, "cannot retrieve user %d\n", geteuid());
exit(1);
}
- uname = user->uname;
while ((c = getopt(argc, argv, "dp:")) != -1) {
switch (c) {
case 'd':
@@ -82,7 +79,7 @@
break;
case 'u':
- uname = optarg;
+ user = np_unix_users->uname2user(np_unix_users, optarg);
break;
default:
@@ -98,29 +95,8 @@
addr = argv[optind];
path = argv[optind+1];
- sfd = socket(PF_INET, SOCK_STREAM, 0);
- if (sfd < 0) {
- perror("socket");
- exit(1);
- }
+ fs = npc_netmount(npc_netaddr(addr, port), user, port, NULL, NULL);
- hostinfo = gethostbyname (addr);
- if (!hostinfo) {
- perror("gethostbyname");
- exit(1);
- }
-
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(port);
- saddr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
-
- if (connect(sfd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
- perror("connect");
- exit(1);
- }
-
- fs = npc_mount(sfd, NULL, "lucho");
-
fid = npc_open(fs, path, Owrite);
if (!fid) {
fid = npc_create(fs, path, 0666, Owrite);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|