tyler.durden
/
dgamelaunch
mirror of https://github.com/paxed/dgamelaunch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull C99 initializers that don't work with Sun compiler :( 

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@191 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-01-30 17:32:12 +00:00
parent fb02d3614b
commit 846f59e3f6
1 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
dgamelaunch.c
View File

@ -93,17 +93,19 @@ struct dg_config *myconfig = NULL;
char* config = NULL; char* config = NULL;
struct dg_config defconfig = { struct dg_config defconfig = {
.chroot = "/var/lib/dgamelaunch/", /* chroot = */ "/var/lib/dgamelaunch/",
.nethack = "/bin/nethack", /* nethack = */ "/bin/nethack",
.dglroot = "/dgldir/", /* dglroot = */ "/dgldir/",
.lockfile = "/dgl-lock", /* lockfile = */ "/dgl-lock",
.passwd = "/dgl-login", /* passwd = */ "/dgl-login",
.banner = "/dgl-banner", /* banner = */ "/dgl-banner",
.rcfile = "/dgl-default-rcfile", /* rcfile = */ "/dgl-default-rcfile",
.spool = "/var/mail/", /* spool = */ "/var/mail/",
.shed_user = "games", .shed_group = "games", /* shed_user = */ "games",
.shed_uid = 5, .shed_gid = 60, /* games:games in Debian */ /* shed_group = */ "games",
.max = 64000 /* shed_uid = */ 5,
/* shed_gid = */ 60, /* games:games in Debian */
/* max = */ 64000
}; };
int loggedin = 0; int loggedin = 0;
@ -237,15 +239,15 @@ gen_inprogress_lock (pid_t pid, char* ttyrec_filename)
char *lockfile = NULL, pidbuf[16]; char *lockfile = NULL, pidbuf[16];
int fd; int fd;
size_t len; size_t len;
struct flock fl = { struct flock fl = { 0 };
.l_type = F_WRLCK,
.l_whence = SEEK_SET,
.l_start = 0,
.l_len = 0
};
snprintf (pidbuf, 16, "%d", pid); snprintf (pidbuf, 16, "%d", pid);
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
fl.l_start = 0;
fl.l_len = 0;
len = strlen(myconfig->dglroot) + strlen(me->username) + strlen(ttyrec_filename) + 13; len = strlen(myconfig->dglroot) + strlen(me->username) + strlen(ttyrec_filename) + 13;
lockfile = calloc(len, sizeof(char)); lockfile = calloc(len, sizeof(char));
@ -381,14 +383,14 @@ populate_games (int *l)
char fullname[130], ttyrecname[130]; char fullname[130], ttyrecname[130];
char *replacestr, *dir; char *replacestr, *dir;
struct dg_game **games = NULL; struct dg_game **games = NULL;
struct flock fl = { struct flock fl = { 0 };
.l_type = F_WRLCK,
.l_whence = SEEK_SET,
.l_start = 0,
.l_len = 0
};
size_t slen; size_t slen;
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
fl.l_start = 0;
fl.l_len = 0;
len = 0; len = 0;
slen = strlen(myconfig->dglroot) + ARRAY_SIZE("inprogress/") + 1; slen = strlen(myconfig->dglroot) + ARRAY_SIZE("inprogress/") + 1;
@ -624,12 +626,12 @@ domailuser (char *username)
FILE *user_spool = NULL; FILE *user_spool = NULL;
time_t now; time_t now;
int mail_empty = 1; int mail_empty = 1;
struct flock fl = { struct flock fl = { 0 };
.l_type = F_WRLCK,
.l_whence = SEEK_SET, fl.l_type = F_WRLCK;
.l_start = 0, fl.l_whence = SEEK_SET;
.l_len = 0 fl.l_start = 0;
}; fl.l_len = 0;
assert (loggedin); assert (loggedin);
@ -993,14 +995,14 @@ readfile (int nolock)
{ {
FILE *fp = NULL, *fpl = NULL; FILE *fp = NULL, *fpl = NULL;
char buf[1200]; char buf[1200];
struct flock fl = { struct flock fl = { 0 };
.l_type = F_RDLCK,
.l_whence = SEEK_SET,
.l_start = 0,
.l_len = 0
};
memset (buf, 1200, 0); fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
fl.l_start = 0;
fl.l_len = 0;
memset (buf, 1024, 0);
/* read new stuff */ /* read new stuff */
@ -1206,12 +1208,12 @@ writefile (int requirenew)
FILE *fp, *fpl; FILE *fp, *fpl;
int i = 0; int i = 0;
int my_done = 0; int my_done = 0;
struct flock fl = { struct flock fl = { 0 };
.l_type = F_WRLCK,
.l_whence = SEEK_SET, fl.l_type = F_WRLCK;
.l_start = 0, fl.l_whence = SEEK_SET;
.l_len = 0 fl.l_start = 0;
}; fl.l_len = 0;
fpl = fopen (myconfig->lockfile, "r+"); fpl = fopen (myconfig->lockfile, "r+");
if (!fpl) if (!fpl)