Skip to content

Master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanderwardan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Master #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddc7cd1
Merge remote-tracking branch 'refs/remotes/JerryCh0/master'
Mar 15, 2016
1298391
Added files via upload
Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions 2.FolderTree/FolderTree/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const char* two_dots = "..";
const char* slash = "/";

//Вывод директории.
void read_dir(char* dirname) {
void read_dir(char* dirname, int max_dirname_len) {

DIR *dir;
struct dirent *entry;
Expand Down Expand Up @@ -49,11 +49,32 @@ void read_dir(char* dirname) {

if (strcmp(dirname, slash) == 0) {
tabs++;
read_dir( strcat( dirname, entry -> d_name) );
if(strlen(dirname) + strlen(entry->d_name) >= max_dirname_len) {//если path стал слишком длинным, реаллакируем память
char* new_dirname;
new_dirname = new char[2 * max_dirname_len];
strcpy(new_dirname, dirname);
strcat(new_dirname, entry -> d_name);
read_dir( new_dirname, 2 * max_dirname_len );
}else {
strcat(dirname, entry -> d_name);
read_dir( dirname, max_dirname_len );
}
}

else{
tabs++;
read_dir( strcat( strcat( dirname, "/"), entry -> d_name) );
if(strlen(dirname) + 1 + strlen(entry->d_name) >= max_dirname_len) {//если path стал слишком длинным, реаллакируем память
char* new_dirname;
new_dirname = new char[2 * max_dirname_len];
strcpy(new_dirname, dirname);
strcat(new_dirname, "/");
strcat(new_dirname, entry->d_name);
read_dir( new_dirname, 2 * max_dirname_len );
}else {
strcat(dirname, "/");
strcat(dirname, entry->d_name);
read_dir( dirname, max_dirname_len );
}
}

}
Expand Down Expand Up @@ -87,11 +108,11 @@ int main() {
dir_flag = en -> d_type;

//Считываем имя требуемой директории.
char name[256];
char *name = new char[100];
scanf("%s", name);

//Обнуляем счетчик отступов.
tabs = 0;

read_dir(name);
read_dir(name, 100);
}