Ok, fixed it to use PATH_MAX and FILENAME_MAX.
also fixed a stupid mistake i made by not catting the trailing / to
directories correctly.
This patch should be against a clean cvs of fileselector.cpp
it gives you the ability to select only a directory and have that
recursively add every file. I also added one line to allow fileselector
menu to restart where you last selected a file.
The recursive add should now work on N deep directories. (note: freeamp
does not typecheck files before adding to the playlist, so if you add a
top level dir that has mixed content, you'll get the mixed content in
your playlist).
also, the recursive patch is completely transparant, normal file
selecting that everyone is accustomed to still works that way. It just
adds the ability to select directories and not just get a dir name in
your playlist.
On Sat, 2002-03-30 at 13:24, Timothy Ball wrote:
> On Sat, Mar 30, 2002 at 01:18:55PM -0500, Timothy Ball wrote:
> >
> > And I thought there was a #define for the MAXPATHNAME or something
> > similar. Would make this nicely platform indiependant and not just
> > generically "big".
> >
>
> Found it..
>
> linux/limits.h:#define PATH_MAX 4095 /* # chars in a path
> name */
>
> --timball
>
> --
> GPG key available on pgpkeys.mit.edu
> pub 1024D/511FBD54 2001-07-23 Timothy Lu Hu Ball <[EMAIL PROTECTED]>
> Key fingerprint = B579 29B0 F6C8 C7AA 3840 E053 FE02 BB97 511F BD54
> _______________________________________________
> [EMAIL PROTECTED]
> http://www.freeamp.org/mailman/listinfo/freeamp-dev
/*____________________________________________________________________________
FreeAmp - The Free MP3 Player
Portions Copyright (C) 1999 EMusic.com
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., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: fileselector.cpp,v 1.8 2000/09/28 08:08:03 ijr Exp $
____________________________________________________________________________*/
#include "config.h"
#include <unistd.h>
#include <dirent.h>
#ifdef __QNX__
#include <strings.h>
#endif
#include "fileselector.h"
#include "utility.h"
char old_path[PATH_MAX]="/\0";
FileSelector::FileSelector(const char *windowtitle)
{
title = windowtitle;
returnpath = "";
extended = true;
ok = false;
done = false;
}
gboolean filesel_destroy(GtkWidget *widget, gpointer p)
{
bool runmain = (bool)p;
if (runmain)
gtk_main_quit();
return FALSE;
}
void ok_internal(GtkWidget *widget, FileSelector *p)
{
p->AddEvent();
}
void cancel_internal(GtkWidget *widget, FileSelector *p)
{
p->CancelEvent();
}
string recursive_path(char subdirs[PATH_MAX], string returnpath,int *sub_rnum)
{
DIR *dir=NULL;
struct dirent *current=NULL;
if ((dir = opendir(subdirs))!=NULL){
current = readdir(dir);
current = readdir(dir);
while((current=readdir(dir))!=NULL){
if(current->d_type==DT_DIR){
char temp_subdir[PATH_MAX];
strncpy(temp_subdir, subdirs,PATH_MAX);
strcat(temp_subdir,"/");
strncat(temp_subdir,current->d_name,FILENAME_MAX);
returnpath = recursive_path(temp_subdir,returnpath,sub_rnum);
}
else {
returnpath += "\n";
returnpath += subdirs;
returnpath += "/";
returnpath += current->d_name;
sub_rnum++;
}
}
}
closedir(dir);
return (returnpath);
}
void FileSelector::CancelEvent()
{
gtk_widget_destroy(filesel);
ok = false;
done = true;
}
void FileSelector::AddEvent()
{
GtkFileSelection *gfile = GTK_FILE_SELECTION(filesel);
char *raw_path = NULL;
GList *row = GTK_CLIST(gfile->file_list)->row_list;
gint rownum = 0;
gint sub_rnum = 0;
char *temp, *path_temp;
char *rawtext = gtk_entry_get_text(GTK_ENTRY(gfile->selection_entry));
if (!strncasecmp("http://";, rawtext, 7) ||
!strncasecmp("rtp://", rawtext, 6)) {
returnpath = strdup_new(rawtext);
gtk_widget_destroy(GTK_WIDGET(gfile));
ok = true;
done = true;
return;
}
returnpath = gtk_file_selection_get_filename(gfile);
path_temp = strdup(returnpath.c_str());
raw_path = gtk_entry_get_text(GTK_ENTRY(gfile->selection_entry));
char *tempdir = strrchr(path_temp, '/');
strncpy(old_path,path_temp,PATH_MAX-1);
if (!tempdir) {
strcpy(path_temp, "./");
path_temp = (char *)realloc(path_temp, strlen(path_temp) + 1);
}
else
tempdir[0] = '\0';
if(row){
while (row) {
if (GTK_CLIST_ROW(row)->state == GTK_STATE_SELECTED) {
if (gtk_clist_get_cell_type(GTK_CLIST(gfile->file_list), rownum, 0)
== GTK_CELL_TEXT) {
gtk_clist_get_text(GTK_CLIST(gfile->file_list), rownum, 0, &temp);
if (!strcmp(temp, raw_path))
goto next_iter;
returnpath += "\n";
returnpath += path_temp;
returnpath += "/";
returnpath += temp;
}
}
next_iter:
rownum++;
row = g_list_next(row);
}
}
else {
char subdirs[PATH_MAX];
strncpy(subdirs,old_path,PATH_MAX-1);
returnpath="";
returnpath = recursive_path(subdirs, returnpath,&sub_rnum);
}
rownum += sub_rnum;
gtk_widget_destroy(GTK_WIDGET(gfile));
free(path_temp);
ok = true;
done = true;
}
bool FileSelector::Run(bool runMain)
{
if (!runMain)
gdk_threads_enter();
filesel = gtk_file_selection_new(title.c_str());
gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), old_path);
gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
gtk_signal_connect(GTK_OBJECT(filesel), "destroy",
GTK_SIGNAL_FUNC(filesel_destroy), (gpointer)runMain);
gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button),
"clicked", GTK_SIGNAL_FUNC(cancel_internal), this);
gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button),
"clicked", GTK_SIGNAL_FUNC(ok_internal), this);
if (extended)
gtk_clist_set_selection_mode(GTK_CLIST(GTK_FILE_SELECTION(filesel)->
file_list), GTK_SELECTION_EXTENDED);
gtk_widget_show(filesel);
if (runMain)
gtk_main();
else {
gdk_threads_leave();
while (!done)
usleep(20);
}
if (ok)
return true;
return false;
}
