105 lines
3.6 KiB
Plaintext
105 lines
3.6 KiB
Plaintext
$OpenBSD: patch-src_main_c,v 1.4 2010/05/20 09:21:17 espie Exp $
|
|
--- src/main.c.orig Sun Dec 28 09:12:38 2003
|
|
+++ src/main.c Wed May 19 18:54:18 2010
|
|
@@ -43,7 +43,9 @@ $Id: patch-src_main_c,v 1.4 2010/05/20 09:21:17 espie Exp $
|
|
#include <sys/sem.h>
|
|
#endif
|
|
#include <errno.h>
|
|
-#include <getopt.h>
|
|
+#ifdef HAVE_GETOPT_H
|
|
+# include <getopt.h>
|
|
+#endif
|
|
#include <string.h>
|
|
#include <db.h>
|
|
#include <glib.h>
|
|
@@ -264,7 +266,7 @@ void display_cnx_status(void)
|
|
if(cnx_in_progress==0)
|
|
val+=2;
|
|
|
|
- sprintf(buf,"%d",val);
|
|
+ snprintf(buf,sizeof(buf),"%d",val);
|
|
disp_msg(VAR_MSG,NULL,"cnx_status",buf,NULL);
|
|
}
|
|
|
|
@@ -314,14 +316,14 @@ void hub_disconnect(HUBDISC_FLAG exit_flag)
|
|
disp_msg(INFO_MSG,"hub_disconnect","have xfer ?",NULL);
|
|
G_LOCK(waiting_action);
|
|
|
|
- sprintf(tmp,"%d xfer",waiting_action->len);
|
|
+ snprintf(tmp,sizeof(tmp),"%d xfer",waiting_action->len);
|
|
disp_msg(INFO_MSG,NULL,tmp,NULL);
|
|
while(waiting_action->len!=0) /* all thread done ? */
|
|
{
|
|
G_UNLOCK(waiting_action);
|
|
sleep(1);
|
|
G_LOCK(waiting_action);
|
|
- sprintf(tmp,"%d xfer",waiting_action->len);
|
|
+ snprintf(tmp,sizeof(tmp),"%d xfer",waiting_action->len);
|
|
disp_msg(INFO_MSG,NULL,tmp,NULL);
|
|
|
|
if(user_wants_to_quit) /* wait except if the user wants to leave now */
|
|
@@ -1049,6 +1051,9 @@ static void display_usage(char *fname)
|
|
"Be careful, most of the information you provide can't contain the following\n"
|
|
"characters because Direct Connect uses them internally: | $\n"
|
|
,fname,dc_version);
|
|
+#ifndef HAVE_GETOPT_LONG
|
|
+ fprintf(stderr,"\nNOTE: Long options are not available on this platform\n");
|
|
+#endif
|
|
}
|
|
|
|
/************************************************************/
|
|
@@ -1175,7 +1180,9 @@ static void start_rebuild_db_thread(void)
|
|
/* beginning of the code */
|
|
int main(int argc,char **argv)
|
|
{
|
|
- static struct option optab[]= {
|
|
+#ifdef HAVE_GETOPT_LONG
|
|
+
|
|
+ static struct option optab[]= {
|
|
{"help",no_argument,NULL,'h'}, /* get help */
|
|
{"nick",required_argument,NULL,'n'}, /* nickname */
|
|
{"info",required_argument,NULL,'i'}, /* user description */
|
|
@@ -1207,7 +1214,9 @@ int main(int argc,char **argv)
|
|
{"virtual_share_dir",required_argument,NULL,'D'}, /* directory containing files containing virtual shared files */
|
|
{NULL,0,NULL,'\0'} /* last option */
|
|
};
|
|
- static const char *short_opt="hn:i:c:e:d:s:o:a:p:g:fT:xwtlv:u:b:5kS:P:U:D:Z:mC:XK:";
|
|
+#endif
|
|
+
|
|
+ static const char *short_opt="hn:i:c:e:d:s:o:a:p:g:fxwtlv:u:m:b:5";
|
|
|
|
int ch;
|
|
int detach_from_tty=0;
|
|
@@ -1262,7 +1271,11 @@ int main(int argc,char **argv)
|
|
pre_gsc=g_string_chunk_new(128);
|
|
pre_gpa=g_ptr_array_new();
|
|
|
|
- while((ch=getopt_long(argc,argv,short_opt,optab,NULL))!=EOF)
|
|
+#ifdef HAVE_GETOPT_LONG
|
|
+ while((ch=getopt_long(argc,argv,short_opt,optab,NULL))!=EOF)
|
|
+#else
|
|
+ while((ch=getopt(argc,argv,short_opt))!= -1)
|
|
+#endif
|
|
{
|
|
switch(ch)
|
|
{
|
|
@@ -1693,7 +1706,8 @@ int main(int argc,char **argv)
|
|
struct sockaddr_un name;
|
|
|
|
name.sun_family=AF_UNIX;
|
|
- strcpy(name.sun_path,local_dctc_udp_sock_path->str);
|
|
+ strncpy(name.sun_path,local_dctc_sock_path->str,sizeof(name.sun_path) - 1);
|
|
+ name.sun_path[sizeof(name.sun_path) - 1] = 0x0;
|
|
if(bind(local_sck_udp,(void *)&name,sizeof(struct sockaddr_un)))
|
|
{
|
|
perror("local_sck_udp - bind");
|
|
@@ -1780,7 +1794,7 @@ int main(int argc,char **argv)
|
|
if(p!=NULL)
|
|
{
|
|
char tmp_str[512];
|
|
- sprintf(tmp_str,"%.2f",cur_pos);
|
|
+ snprintf(tmp_str,sizeof(tmp_str),"%.2f",cur_pos);
|
|
disp_msg(PROGRESS_BAR,"","init_share",tmp_str,"Initialize shared file database",p,NULL);
|
|
add_shared_directory(p);
|
|
}
|